diff --git a/.gitignore b/.gitignore
index 5983ce0..fdaa812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 
 # misc files
 .*.swp
+.remote-sync.json
+.DS_Store
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 9111aab..d9dc664 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,7 +17,7 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.2.7
+version: 2.2.8
 
 # app version applies to multiple components with potentially different
 # container image versions
diff --git a/voltha/templates/ofagent-go.yaml b/voltha/templates/ofagent-go.yaml
index e9e7116..07c2b94 100644
--- a/voltha/templates/ofagent-go.yaml
+++ b/voltha/templates/ofagent-go.yaml
@@ -61,8 +61,8 @@
       serviceAccountName: {{ .Values.serviceaccount }}
       containers:
       - name: ofagent
-        image: '{{ tpl .Values.images.ofagent.registry . }}{{ tpl .Values.images.ofagent.repository . }}:{{ tpl .Values.images.ofagent.tag . }}'
-        imagePullPolicy: {{ tpl .Values.images.ofagent.pullPolicy . }}
+        image: '{{ tpl .Values.images.ofagent_go.registry . }}{{ tpl .Values.images.ofagent_go.repository . }}:{{ tpl .Values.images.ofagent_go.tag . }}'
+        imagePullPolicy: {{ tpl .Values.images.ofagent_go.pullPolicy . }}
         env:
         - name: CONTROLLER_SERVICE
           value: "{{ .Values.services.controller.service }}:{{ .Values.services.controller.port }}"
diff --git a/voltha/templates/ofagent-py.yaml b/voltha/templates/ofagent-py.yaml
index dcde907..7996d80 100644
--- a/voltha/templates/ofagent-py.yaml
+++ b/voltha/templates/ofagent-py.yaml
@@ -61,8 +61,8 @@
       serviceAccountName: {{ .Values.serviceaccount }}
       containers:
       - name: ofagent
-        image: '{{ tpl .Values.images.ofagent.registry . }}{{ tpl .Values.images.ofagent.repository . }}:{{ tpl .Values.images.ofagent.tag . }}'
-        imagePullPolicy: {{ tpl .Values.images.ofagent.pullPolicy . }}
+        image: '{{ tpl .Values.images.ofagent_py.registry . }}{{ tpl .Values.images.ofagent_py.repository . }}:{{ tpl .Values.images.ofagent_py.tag . }}'
+        imagePullPolicy: {{ tpl .Values.images.ofagent_py.pullPolicy . }}
         env:
         - name: CONTROLLER_SERVICE
           value: "{{ .Values.services.controller.service }}:{{ .Values.services.controller.port }}"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 8f52628..941abea 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -16,7 +16,7 @@
 serviceaccount: voltha-serviceaccount
 private_etcd_cluster: true
 private_kafka_cluster: true
-use_ofagent_go: false
+use_ofagent_go: true
 
 # Default Values
 # The following are the default values used for every container in the
@@ -88,7 +88,13 @@
 
 # Define Docker images to be used
 images:
-  ofagent:
+  ofagent_go:
+    registry: '{{ .Values.defaults.image_registry }}'
+    repository: '{{ .Values.defaults.image_org }}ofagent-go'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.1.4{{- end }}{{- else }}1.1.4{{- end }}'
+    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
+
+  ofagent_py:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-ofagent'
     tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.4{{- end }}{{- else }}2.2.4{{- end }}'
@@ -99,4 +105,3 @@
     repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
     tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.3.2{{- end }}{{- else }}2.3.2{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
-