diff --git a/voltha-go-controller/templates/deployment.yaml b/voltha-go-controller/templates/deployment.yaml
new file mode 100644
index 0000000..7d1516e
--- /dev/null
+++ b/voltha-go-controller/templates/deployment.yaml
@@ -0,0 +1,66 @@
+# Copyright 2022-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "{{ .Chart.Name }}"
+  labels:
+    release: {{ .Release.Name }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: "{{ .Chart.Name }}"
+  template:
+    metadata:
+      labels:
+        app: "{{ .Chart.Name }}"
+    spec:
+      containers:
+      - env:
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: VOLTHA_HOST
+          value: "$(NAMESPACE)-voltha-api.$(NAMESPACE).svc.cluster.local"
+        - name: VOLTHA_PORT
+          value: "55555"
+        - name: KV_STORE_TYPE
+          value: "redis"
+        - name: KV_STORE_HOST
+          value: "redis-master.{{ .Values.global.voltha_infra_namespace }}.svc.cluster.local"
+        - name: KV_STORE_PORT
+          value: "6379"
+        - name: KAFKA_ADAPTER_HOST
+          value: "internal-kafka-headless.{{ .Values.global.voltha_infra_namespace }}.svc.cluster.local"
+        - name: KAFKA_ADAPTER_PORT
+          value: "9092"
+        - name: LOG_LEVEL
+          value: .Values.global.log_level
+        image: '{{ tpl .Values.images.voltha_go_controller.registry . }}{{ tpl .Values.images.voltha_go_controller.repository . }}:{{ tpl ( tpl .Values.images.voltha_go_controller.tag . ) . }}'
+        imagePullPolicy: {{ tpl .Values.images.voltha_go_controller.pullPolicy . }}
+        name: voltha-go-controller
+        ports:
+        - containerPort: {{ .Values.voltha_go_controller.sshPort }}
+          name: ssh-port
+        - containerPort: {{ .Values.voltha_go_controller.uiPort }}
+          name: ui-port
+          protocol: "{{ .Values.voltha_go_controller.uiProtocol }}"
+      restartPolicy: "Always"
diff --git a/voltha-go-controller/templates/service.yaml b/voltha-go-controller/templates/service.yaml
new file mode 100644
index 0000000..4833f2a
--- /dev/null
+++ b/voltha-go-controller/templates/service.yaml
@@ -0,0 +1,31 @@
+# Copyright 2022-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    name: "{{ .Chart.Name }}"
+    release: {{ .Release.Name }}
+  name: "{{ .Chart.Name }}"
+spec:
+  ports:
+  - name: of
+    port: {{ .Values.voltha_go_controller.ofPort }}
+    targetPort: {{ .Values.voltha_go_controller.ofPort }}
+  - name: ui
+    port: {{ .Values.voltha_go_controller.uiPort }}
+    targetPort: {{ .Values.voltha_go_controller.uiPort }}
+  selector:
+    app: "{{ .Chart.Name }}"