diff --git a/xos-services/addressmanager/Chart.yaml b/xos-services/addressmanager/Chart.yaml
index 2d43e4e..8598325 100644
--- a/xos-services/addressmanager/Chart.yaml
+++ b/xos-services/addressmanager/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: addressmanager
 description: A Helm chart for XOS's "addressmanager" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.0.1
-appVersion: 2.0.1
-
+version: 2.0.0
diff --git a/xos-services/addressmanager/templates/_helpers.tpl b/xos-services/addressmanager/templates/_helpers.tpl
index b85862a..dbf02ef 100644
--- a/xos-services/addressmanager/templates/_helpers.tpl
+++ b/xos-services/addressmanager/templates/_helpers.tpl
@@ -67,16 +67,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.addressmanager
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/addressmanager/templates/deployment.yaml b/xos-services/addressmanager/templates/deployment.yaml
index 61f1900..7610ca4 100644
--- a/xos-services/addressmanager/templates/deployment.yaml
+++ b/xos-services/addressmanager/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.addressmanager_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/addressmanager/values.yaml b/xos-services/addressmanager/values.yaml
index cc9b4e6..eb570da 100644
--- a/xos-services/addressmanager/values.yaml
+++ b/xos-services/addressmanager/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/addressmanager-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+addressmanager_synchronizerImage: "xosproject/addressmanager-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/att-workflow-driver/Chart.yaml b/xos-services/att-workflow-driver/Chart.yaml
index a9cec7c..5918548 100644
--- a/xos-services/att-workflow-driver/Chart.yaml
+++ b/xos-services/att-workflow-driver/Chart.yaml
@@ -16,7 +16,4 @@
 
 name: att-workflow-driver
 description: A Helm chart for XOS's "att-workflow-driver" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.2
-appVersion: 1.0.2
+version: 1.0.0-dev
diff --git a/xos-services/att-workflow-driver/templates/deployment.yaml b/xos-services/att-workflow-driver/templates/deployment.yaml
index 2b7b439..2f1f479 100644
--- a/xos-services/att-workflow-driver/templates/deployment.yaml
+++ b/xos-services/att-workflow-driver/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.attWorkflowDriver_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/att-workflow-driver/values.yaml b/xos-services/att-workflow-driver/values.yaml
index d1c0289..d6335d3 100644
--- a/xos-services/att-workflow-driver/values.yaml
+++ b/xos-services/att-workflow-driver/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/att-workflow-driver-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+attWorkflowDriver_synchronizerImage: "xosproject/att-workflow-driver-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/epc-service/Chart.yaml b/xos-services/epc-service/Chart.yaml
index fc914fe..47e6af6 100644
--- a/xos-services/epc-service/Chart.yaml
+++ b/xos-services/epc-service/Chart.yaml
@@ -16,7 +16,4 @@
 
 name: epc-service
 description: A Helm chart for XOS's "epc-service" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.1.1
-appVersion: 1.1.1
+version: 1.0.0
diff --git a/xos-services/epc-service/templates/_helpers.tpl b/xos-services/epc-service/templates/_helpers.tpl
index 531bb40..d87ebba 100644
--- a/xos-services/epc-service/templates/_helpers.tpl
+++ b/xos-services/epc-service/templates/_helpers.tpl
@@ -62,17 +62,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.epc-service
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
-
 {{- end -}}
diff --git a/xos-services/epc-service/templates/deployment.yaml b/xos-services/epc-service/templates/deployment.yaml
index 6b487ba..f6e7203 100644
--- a/xos-services/epc-service/templates/deployment.yaml
+++ b/xos-services/epc-service/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/epc-service/values.yaml b/xos-services/epc-service/values.yaml
index 5788f24..1bbf5be 100644
--- a/xos-services/epc-service/values.yaml
+++ b/xos-services/epc-service/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/vepc-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+synchronizerImage: "xosproject/vepc-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/exampleservice/Chart.yaml b/xos-services/exampleservice/Chart.yaml
index 89057e8..cf29f5d 100644
--- a/xos-services/exampleservice/Chart.yaml
+++ b/xos-services/exampleservice/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: exampleservice
 description: A Helm chart for XOS's "exampleservice" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.1.1
-appVersion: 2.1.1
-
+version: 2.1.0
diff --git a/xos-services/exampleservice/templates/_helpers.tpl b/xos-services/exampleservice/templates/_helpers.tpl
index c33f782..7caad77 100644
--- a/xos-services/exampleservice/templates/_helpers.tpl
+++ b/xos-services/exampleservice/templates/_helpers.tpl
@@ -58,17 +58,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.exampleservice
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 proxy_ssh:
   enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/exampleservice/templates/deployment.yaml b/xos-services/exampleservice/templates/deployment.yaml
index 8a42d38..4fdce2f 100644
--- a/xos-services/exampleservice/templates/deployment.yaml
+++ b/xos-services/exampleservice/templates/deployment.yaml
@@ -36,8 +36,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.exampleservice_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/exampleservice/values.yaml b/xos-services/exampleservice/values.yaml
index 6fea766..3ae9782 100644
--- a/xos-services/exampleservice/values.yaml
+++ b/xos-services/exampleservice/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: "xosproject/exampleservice-synchronizer"
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+exampleservice_synchronizerImage: "xosproject/exampleservice-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -47,4 +46,3 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
diff --git a/xos-services/fabric-crossconnect/Chart.yaml b/xos-services/fabric-crossconnect/Chart.yaml
index caeb202..0df5df0 100644
--- a/xos-services/fabric-crossconnect/Chart.yaml
+++ b/xos-services/fabric-crossconnect/Chart.yaml
@@ -15,9 +15,4 @@
 
 name: fabric-crossconnect
 description: A Helm chart for XOS's "fabric-crossconnect" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.1.1
-appVersion: 1.1.1
-
-
+version: 1.0.0-dev
diff --git a/xos-services/fabric-crossconnect/templates/deployment.yaml b/xos-services/fabric-crossconnect/templates/deployment.yaml
index 9017f21..e657d34 100644
--- a/xos-services/fabric-crossconnect/templates/deployment.yaml
+++ b/xos-services/fabric-crossconnect/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.fabric_crossconnect_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/fabric-crossconnect/values.yaml b/xos-services/fabric-crossconnect/values.yaml
index 4994d5a..cac52c3 100644
--- a/xos-services/fabric-crossconnect/values.yaml
+++ b/xos-services/fabric-crossconnect/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/fabric-crossconnect-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+fabric_crossconnect_synchronizerImage: "xosproject/fabric-crossconnect-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/fabric/Chart.yaml b/xos-services/fabric/Chart.yaml
index 85981f0..de60496 100644
--- a/xos-services/fabric/Chart.yaml
+++ b/xos-services/fabric/Chart.yaml
@@ -16,8 +16,4 @@
 
 name: fabric
 description: A Helm chart for XOS's "fabric" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.1.3
-appVersion: 2.1.3
-
+version: 2.0.1-dev
diff --git a/xos-services/fabric/templates/deployment.yaml b/xos-services/fabric/templates/deployment.yaml
index 6c666b8..031abc1 100644
--- a/xos-services/fabric/templates/deployment.yaml
+++ b/xos-services/fabric/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.fabric_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/fabric/values.yaml b/xos-services/fabric/values.yaml
index de47cc9..2f6122c 100644
--- a/xos-services/fabric/values.yaml
+++ b/xos-services/fabric/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: xosproject/fabric-synchronizer
-  tag: "{{ .Chart.AppVersion }}"
-  pullPolicy: Always
+imagePullPolicy: 'Always'
 
-global:
-  registry: ""
+fabric_synchronizerImage: "xosproject/fabric-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/hippie-oss/Chart.yaml b/xos-services/hippie-oss/Chart.yaml
index 2a96022..1da9cf9 100644
--- a/xos-services/hippie-oss/Chart.yaml
+++ b/xos-services/hippie-oss/Chart.yaml
@@ -1,4 +1,5 @@
 ---
+
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +16,4 @@
 
 name: hippie-oss
 description: A Helm chart for XOS's "hippie-oss" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.1.0
-appVersion: 1.1.0
+version: 1.1.0-dev
diff --git a/xos-services/hippie-oss/templates/_helpers.tpl b/xos-services/hippie-oss/templates/_helpers.tpl
index 5f5aa5d..f6f87b8 100644
--- a/xos-services/hippie-oss/templates/_helpers.tpl
+++ b/xos-services/hippie-oss/templates/_helpers.tpl
@@ -65,16 +65,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.hippie-oss
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/hippie-oss/templates/deployment.yaml b/xos-services/hippie-oss/templates/deployment.yaml
index ed3d534..3d31bad 100644
--- a/xos-services/hippie-oss/templates/deployment.yaml
+++ b/xos-services/hippie-oss/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.hippieOSS_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/hippie-oss/values.yaml b/xos-services/hippie-oss/values.yaml
index 46f89c6..9c67f03 100644
--- a/xos-services/hippie-oss/values.yaml
+++ b/xos-services/hippie-oss/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/hippie-oss-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+hippieOSS_synchronizerImage: "xosproject/hippie-oss-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/hssdb/Chart.yaml b/xos-services/hssdb/Chart.yaml
index be71c23..08c1ec0 100644
--- a/xos-services/hssdb/Chart.yaml
+++ b/xos-services/hssdb/Chart.yaml
@@ -16,8 +16,4 @@
 
 name: hssdb
 description: A Helm chart for XOS's "hssdb" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
-
+version: 1.0.0
diff --git a/xos-services/hssdb/templates/_helpers.tpl b/xos-services/hssdb/templates/_helpers.tpl
index 9cadd45..28a0acb 100644
--- a/xos-services/hssdb/templates/_helpers.tpl
+++ b/xos-services/hssdb/templates/_helpers.tpl
@@ -62,17 +62,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.hssdb
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 proxy_ssh:
   enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/hssdb/templates/deployment.yaml b/xos-services/hssdb/templates/deployment.yaml
index a71be99..ece871e 100644
--- a/xos-services/hssdb/templates/deployment.yaml
+++ b/xos-services/hssdb/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/hssdb/values.yaml b/xos-services/hssdb/values.yaml
index 410178e..c412926 100644
--- a/xos-services/hssdb/values.yaml
+++ b/xos-services/hssdb/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/hssdb-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/hssdb-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -41,7 +40,6 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
 
 resources: {}
 
diff --git a/xos-services/internetemulator/Chart.yaml b/xos-services/internetemulator/Chart.yaml
index 95edca9..188d767 100644
--- a/xos-services/internetemulator/Chart.yaml
+++ b/xos-services/internetemulator/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: internetemulator
 description: A Helm chart for XOS's "internetemulator" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
-
+version: 1.0.0
diff --git a/xos-services/internetemulator/templates/_helpers.tpl b/xos-services/internetemulator/templates/_helpers.tpl
index 13a5e2c..04a008e 100644
--- a/xos-services/internetemulator/templates/_helpers.tpl
+++ b/xos-services/internetemulator/templates/_helpers.tpl
@@ -62,17 +62,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.internetemulator
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 proxy_ssh:
   enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/internetemulator/templates/deployment.yaml b/xos-services/internetemulator/templates/deployment.yaml
index 2e57bbe..33e24ce 100644
--- a/xos-services/internetemulator/templates/deployment.yaml
+++ b/xos-services/internetemulator/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/internetemulator/values.yaml b/xos-services/internetemulator/values.yaml
index 48d8ae7..4a21056 100644
--- a/xos-services/internetemulator/values.yaml
+++ b/xos-services/internetemulator/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/internetemulator-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/internetemulator-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -40,7 +39,6 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
 
 resources: {}
 
diff --git a/xos-services/kubernetes/Chart.yaml b/xos-services/kubernetes/Chart.yaml
index 1377a99..e565a0e 100644
--- a/xos-services/kubernetes/Chart.yaml
+++ b/xos-services/kubernetes/Chart.yaml
@@ -15,10 +15,4 @@
 
 name: kubernetes
 description: A Helm chart for XOS's "kubernetes" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.4
-appVersion: 1.0.4
-
-
-
+version: 1.0.1-dev
diff --git a/xos-services/kubernetes/templates/deployment.yaml b/xos-services/kubernetes/templates/deployment.yaml
index 83763ca..5c4a96a 100644
--- a/xos-services/kubernetes/templates/deployment.yaml
+++ b/xos-services/kubernetes/templates/deployment.yaml
@@ -40,8 +40,8 @@
       serviceAccountName: kubernetes-synchronizer
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.kubernetes_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/kubernetes/values.yaml b/xos-services/kubernetes/values.yaml
index a1383be..3b0634b 100644
--- a/xos-services/kubernetes/values.yaml
+++ b/xos-services/kubernetes/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/kubernetes-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/mcord-subscriber/Chart.yaml b/xos-services/mcord-subscriber/Chart.yaml
index 01109e5..ab2afd4 100644
--- a/xos-services/mcord-subscriber/Chart.yaml
+++ b/xos-services/mcord-subscriber/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: mcord-subscriber
 description: A Helm chart that creates a subscriber for the "mcord" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.0.1
-appVersion: 2.0.1
+version: 2.0.0
diff --git a/xos-services/mcord-subscriber/templates/_helpers.tpl b/xos-services/mcord-subscriber/templates/_helpers.tpl
index cf10579..3957742 100644
--- a/xos-services/mcord-subscriber/templates/_helpers.tpl
+++ b/xos-services/mcord-subscriber/templates/_helpers.tpl
@@ -62,16 +62,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.mcord-subscriber
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/mcord-subscriber/templates/job.yaml b/xos-services/mcord-subscriber/templates/job.yaml
index 6e1ce5e..ab6051a 100644
--- a/xos-services/mcord-subscriber/templates/job.yaml
+++ b/xos-services/mcord-subscriber/templates/job.yaml
@@ -34,8 +34,8 @@
       restartPolicy: Never
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/mcord-subscriber/values.yaml b/xos-services/mcord-subscriber/values.yaml
index 709c506..8889d0f 100644
--- a/xos-services/mcord-subscriber/values.yaml
+++ b/xos-services/mcord-subscriber/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/mcord-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+synchronizerImage: "xosproject/mcord-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/onos-service/Chart.yaml b/xos-services/onos-service/Chart.yaml
index 8c92ab6..248ffbf 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -15,5 +15,4 @@
 
 description: A Helm chart for XOS's "onos-service" service, which configures ONOS
 name: onos-service
-version: 2.0.5
-appVersion: 2.0.5
+version: 2.0.2-dev
diff --git a/xos-services/onos-service/templates/deployment.yaml b/xos-services/onos-service/templates/deployment.yaml
index 0398ee0..967d501 100644
--- a/xos-services/onos-service/templates/deployment.yaml
+++ b/xos-services/onos-service/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image:  {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.onos_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 21c4bbe..ab52be0 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/onos-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ""
+onos_synchronizerImage: "xosproject/onos-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/openstack/Chart.yaml b/xos-services/openstack/Chart.yaml
index e5d299f..bd187f7 100644
--- a/xos-services/openstack/Chart.yaml
+++ b/xos-services/openstack/Chart.yaml
@@ -15,5 +15,4 @@
 
 name: openstack
 description: A Helm chart for XOS's "openstack" service
-version: 1.0.1
-appVersion: 1.0.1
+version: 1.0.0
diff --git a/xos-services/openstack/templates/_helpers.tpl b/xos-services/openstack/templates/_helpers.tpl
index fdca6e8..7a5e6d4 100644
--- a/xos-services/openstack/templates/_helpers.tpl
+++ b/xos-services/openstack/templates/_helpers.tpl
@@ -57,17 +57,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.openstack
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 nova:
   ca_ssl_cert: "/etc/ssl/certs/ca-certificates.crt"
diff --git a/xos-services/openstack/templates/deployment.yaml b/xos-services/openstack/templates/deployment.yaml
index 0e94850..6b985f5 100644
--- a/xos-services/openstack/templates/deployment.yaml
+++ b/xos-services/openstack/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.openstack_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/openstack/values.yaml b/xos-services/openstack/values.yaml
index e619da0..bf45148 100644
--- a/xos-services/openstack/values.yaml
+++ b/xos-services/openstack/values.yaml
@@ -24,13 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-image:
-  repository: xosproject/openstack-synchronizer
-  tag: "{{ .Chart.AppVersion }}"
-  pullPolicy: Always
-
-global:
-  registry: ""
+openstack_synchronizerImage: "xosproject/openstack-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/progran/Chart.yaml b/xos-services/progran/Chart.yaml
index ddf1ad2..0d386c3 100644
--- a/xos-services/progran/Chart.yaml
+++ b/xos-services/progran/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: progran
 description: A Helm chart for XOS's "progran" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.0.2
-appVersion: 2.0.2
+version: 2.0.0
diff --git a/xos-services/progran/templates/_helpers.tpl b/xos-services/progran/templates/_helpers.tpl
index 8c2404d..1ee8fa4 100644
--- a/xos-services/progran/templates/_helpers.tpl
+++ b/xos-services/progran/templates/_helpers.tpl
@@ -62,16 +62,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.progran
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/progran/templates/deployment.yaml b/xos-services/progran/templates/deployment.yaml
index e8600cc..7671550 100644
--- a/xos-services/progran/templates/deployment.yaml
+++ b/xos-services/progran/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/progran/values.yaml b/xos-services/progran/values.yaml
index c300941..e26b6fa 100644
--- a/xos-services/progran/values.yaml
+++ b/xos-services/progran/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/progran-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+synchronizerImage: "xosproject/progran-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/rcord/Chart.yaml b/xos-services/rcord/Chart.yaml
index 4e33f42..873db9c 100644
--- a/xos-services/rcord/Chart.yaml
+++ b/xos-services/rcord/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: rcord
 description: A Helm chart for XOS's "rcord" service
-icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.4
-
-appVersion: 1.0.4
+version: 1.1.0-dev
diff --git a/xos-services/rcord/templates/deployment.yaml b/xos-services/rcord/templates/deployment.yaml
index 83b7720..de345b3 100644
--- a/xos-services/rcord/templates/deployment.yaml
+++ b/xos-services/rcord/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image:  {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.rcord_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/rcord/values.yaml b/xos-services/rcord/values.yaml
index a6e1155..7d41776 100644
--- a/xos-services/rcord/values.yaml
+++ b/xos-services/rcord/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/rcord-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ""
+rcord_synchronizerImage: "xosproject/rcord-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/sdncontroller/Chart.yaml b/xos-services/sdncontroller/Chart.yaml
index abbcdb7..d928666 100644
--- a/xos-services/sdncontroller/Chart.yaml
+++ b/xos-services/sdncontroller/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: sdncontroller
 description: A Helm chart for XOS's "sdncontroller" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
+version: 1.0.0
diff --git a/xos-services/sdncontroller/templates/_helpers.tpl b/xos-services/sdncontroller/templates/_helpers.tpl
index cb055ba..e573928 100644
--- a/xos-services/sdncontroller/templates/_helpers.tpl
+++ b/xos-services/sdncontroller/templates/_helpers.tpl
@@ -62,17 +62,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.sdncontroller
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 proxy_ssh:
   enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/sdncontroller/templates/deployment.yaml b/xos-services/sdncontroller/templates/deployment.yaml
index 2c886f2..f28559b 100644
--- a/xos-services/sdncontroller/templates/deployment.yaml
+++ b/xos-services/sdncontroller/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/sdncontroller/values.yaml b/xos-services/sdncontroller/values.yaml
index a9230ef..64a493a 100644
--- a/xos-services/sdncontroller/values.yaml
+++ b/xos-services/sdncontroller/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/sdncontroller-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/sdncontroller-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -41,7 +40,6 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
 
 resources: {}
 
diff --git a/xos-services/simpleexampleservice/Chart.yaml b/xos-services/simpleexampleservice/Chart.yaml
index f4bc0ce..0a88434 100644
--- a/xos-services/simpleexampleservice/Chart.yaml
+++ b/xos-services/simpleexampleservice/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: simpleexampleservice
 description: A Helm chart for XOS's "simpleexampleservice" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
+version: 1.0.0
diff --git a/xos-services/simpleexampleservice/templates/_helpers.tpl b/xos-services/simpleexampleservice/templates/_helpers.tpl
index 58a8fe2..e898ed7 100644
--- a/xos-services/simpleexampleservice/templates/_helpers.tpl
+++ b/xos-services/simpleexampleservice/templates/_helpers.tpl
@@ -81,16 +81,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.simpleexampleservice
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/simpleexampleservice/templates/deployment.yaml b/xos-services/simpleexampleservice/templates/deployment.yaml
index 57db355..05b69eb 100644
--- a/xos-services/simpleexampleservice/templates/deployment.yaml
+++ b/xos-services/simpleexampleservice/templates/deployment.yaml
@@ -36,8 +36,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.simpleexampleservice_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/simpleexampleservice/values.yaml b/xos-services/simpleexampleservice/values.yaml
index 69724c6..f985089 100644
--- a/xos-services/simpleexampleservice/values.yaml
+++ b/xos-services/simpleexampleservice/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/simpleexampleservice-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+simpleexampleservice_synchronizerImage: "xosproject/simpleexampleservice-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/k8sepcservice/Chart.yaml b/xos-services/vepcservice/Chart.yaml
similarity index 78%
rename from xos-services/k8sepcservice/Chart.yaml
rename to xos-services/vepcservice/Chart.yaml
index a8ff283..2d874fd 100644
--- a/xos-services/k8sepcservice/Chart.yaml
+++ b/xos-services/vepcservice/Chart.yaml
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: k8sepcservice
-description: A Helm chart for XOS's "k8sepcservice" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.2
-appVersion: 1.0.2
+name: vepcservice
+description: A Helm chart for XOS's "vepcservice" service
+version: 1.0.0
diff --git a/xos-services/k8sepcservice/templates/_helpers.tpl b/xos-services/vepcservice/templates/_helpers.tpl
similarity index 100%
rename from xos-services/k8sepcservice/templates/_helpers.tpl
rename to xos-services/vepcservice/templates/_helpers.tpl
diff --git a/xos-services/k8sepcservice/templates/_tosca.tpl b/xos-services/vepcservice/templates/_tosca.tpl
similarity index 100%
rename from xos-services/k8sepcservice/templates/_tosca.tpl
rename to xos-services/vepcservice/templates/_tosca.tpl
diff --git a/xos-services/k8sepcservice/templates/configmap.yaml b/xos-services/vepcservice/templates/configmap.yaml
similarity index 100%
rename from xos-services/k8sepcservice/templates/configmap.yaml
rename to xos-services/vepcservice/templates/configmap.yaml
diff --git a/xos-services/k8sepcservice/templates/deployment.yaml b/xos-services/vepcservice/templates/deployment.yaml
similarity index 93%
rename from xos-services/k8sepcservice/templates/deployment.yaml
rename to xos-services/vepcservice/templates/deployment.yaml
index c017457..548c018 100644
--- a/xos-services/k8sepcservice/templates/deployment.yaml
+++ b/xos-services/vepcservice/templates/deployment.yaml
@@ -36,8 +36,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.vepcservice_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/k8sepcservice/values.yaml b/xos-services/vepcservice/values.yaml
similarity index 82%
rename from xos-services/k8sepcservice/values.yaml
rename to xos-services/vepcservice/values.yaml
index 35ae662..f5a6fda 100644
--- a/xos-services/k8sepcservice/values.yaml
+++ b/xos-services/vepcservice/values.yaml
@@ -22,13 +22,10 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/k8sepcservice-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+vepcservice_synchronizerImage: "xosproject/k8sepcservice-synchronizer:{{ .Chart.Version }}"
+#vepcservice_synchronizerImage: "gopinatht/k8sepcservice-synchronizer:candidate"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vhss/Chart.yaml b/xos-services/vhss/Chart.yaml
index efe2c4f..6de9a24 100644
--- a/xos-services/vhss/Chart.yaml
+++ b/xos-services/vhss/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: vhss
 description: A Helm chart for XOS's "vhss" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.2
-appVersion: 1.0.2
-
+version: 1.0.1
diff --git a/xos-services/vhss/templates/_helpers.tpl b/xos-services/vhss/templates/_helpers.tpl
index 04bc6db..bfee549 100644
--- a/xos-services/vhss/templates/_helpers.tpl
+++ b/xos-services/vhss/templates/_helpers.tpl
@@ -62,17 +62,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.vhss
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 proxy_ssh:
   enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/vhss/templates/deployment.yaml b/xos-services/vhss/templates/deployment.yaml
index 81fd874..e697547 100644
--- a/xos-services/vhss/templates/deployment.yaml
+++ b/xos-services/vhss/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/vhss/values.yaml b/xos-services/vhss/values.yaml
index 21a18e4..e188e13 100644
--- a/xos-services/vhss/values.yaml
+++ b/xos-services/vhss/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/vhss-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/vhss-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -41,7 +40,6 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
 
 resources: {}
 
diff --git a/xos-services/vmme/Chart.yaml b/xos-services/vmme/Chart.yaml
index d3907f3..9469ede 100644
--- a/xos-services/vmme/Chart.yaml
+++ b/xos-services/vmme/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: vmme
 description: A Helm chart for XOS's "vmme" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.2
-appVersion: 1.0.2
-
+version: 1.0.1
diff --git a/xos-services/vmme/templates/_helpers.tpl b/xos-services/vmme/templates/_helpers.tpl
index 0e2c541..318d26a 100644
--- a/xos-services/vmme/templates/_helpers.tpl
+++ b/xos-services/vmme/templates/_helpers.tpl
@@ -62,17 +62,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.vmme
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 proxy_ssh:
   enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/vmme/templates/deployment.yaml b/xos-services/vmme/templates/deployment.yaml
index e609c52..783084f 100644
--- a/xos-services/vmme/templates/deployment.yaml
+++ b/xos-services/vmme/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/vmme/values.yaml b/xos-services/vmme/values.yaml
index 2fc8801..b6d6358 100644
--- a/xos-services/vmme/values.yaml
+++ b/xos-services/vmme/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/vmme-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/vmme-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -41,7 +40,6 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
 
 resources: {}
 
diff --git a/xos-services/volt/Chart.yaml b/xos-services/volt/Chart.yaml
index cf235e9..f432ea8 100644
--- a/xos-services/volt/Chart.yaml
+++ b/xos-services/volt/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: volt
 description: A Helm chart for XOS's "olt-service" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.1.1
-appVersion: 2.1.1
+version: 2.0.2-dev
diff --git a/xos-services/volt/templates/deployment.yaml b/xos-services/volt/templates/deployment.yaml
index dee6e15..eb20190 100644
--- a/xos-services/volt/templates/deployment.yaml
+++ b/xos-services/volt/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.volt_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/volt/values.yaml b/xos-services/volt/values.yaml
index b5023e1..52cd1df 100644
--- a/xos-services/volt/values.yaml
+++ b/xos-services/volt/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/volt-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+volt_synchronizerImage: "xosproject/volt-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vrouter/Chart.yaml b/xos-services/vrouter/Chart.yaml
index a20efd4..195b125 100644
--- a/xos-services/vrouter/Chart.yaml
+++ b/xos-services/vrouter/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: vrouter
 description: A Helm chart for XOS's "vRouter" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.0.3
-appVersion: 2.0.3
+version: 2.0.1-dev
diff --git a/xos-services/vrouter/templates/deployment.yaml b/xos-services/vrouter/templates/deployment.yaml
index 9cfcc8d..f04837e 100644
--- a/xos-services/vrouter/templates/deployment.yaml
+++ b/xos-services/vrouter/templates/deployment.yaml
@@ -39,8 +39,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.vrouter_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/vrouter/values.yaml b/xos-services/vrouter/values.yaml
index 0bfd1cf..5264a2c 100644
--- a/xos-services/vrouter/values.yaml
+++ b/xos-services/vrouter/values.yaml
@@ -22,14 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
+imagePullPolicy: 'Always'
 
-image:
-  repository: 'xosproject/vrouter-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
-
-global:
-  registry: ''
+vrouter_synchronizerImage: "xosproject/vrouter-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vsg-hw/Chart.yaml b/xos-services/vsg-hw/Chart.yaml
index 40bf934..d7346b7 100644
--- a/xos-services/vsg-hw/Chart.yaml
+++ b/xos-services/vsg-hw/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: vsg-hw
 description: A Helm chart for XOS's "vsg-hw" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
+version: 1.0.0
diff --git a/xos-services/vsg-hw/templates/_helpers.tpl b/xos-services/vsg-hw/templates/_helpers.tpl
index facf592..39e80cb 100644
--- a/xos-services/vsg-hw/templates/_helpers.tpl
+++ b/xos-services/vsg-hw/templates/_helpers.tpl
@@ -62,16 +62,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.vsg-hw
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/vsg-hw/templates/deployment.yaml b/xos-services/vsg-hw/templates/deployment.yaml
index 696ba93..ba7fe62 100644
--- a/xos-services/vsg-hw/templates/deployment.yaml
+++ b/xos-services/vsg-hw/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.vsg_hw_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/vsg-hw/values.yaml b/xos-services/vsg-hw/values.yaml
index 5fe50a1..43b15fa 100644
--- a/xos-services/vsg-hw/values.yaml
+++ b/xos-services/vsg-hw/values.yaml
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/vsg-hw-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+vsg_hw_synchronizerImage: "xosproject/vsg-hw-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vspgwc/Chart.yaml b/xos-services/vspgwc/Chart.yaml
index 251ea2a..5314b07 100644
--- a/xos-services/vspgwc/Chart.yaml
+++ b/xos-services/vspgwc/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: vspgwc
 description: A Helm chart for XOS's "vspgwc" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
+version: 1.0.0
diff --git a/xos-services/vspgwc/templates/_helpers.tpl b/xos-services/vspgwc/templates/_helpers.tpl
index 8cc7bd0..340742b 100644
--- a/xos-services/vspgwc/templates/_helpers.tpl
+++ b/xos-services/vspgwc/templates/_helpers.tpl
@@ -62,17 +62,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.vspgwc
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 proxy_ssh:
   enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/vspgwc/templates/deployment.yaml b/xos-services/vspgwc/templates/deployment.yaml
index 76a517d..061191a 100644
--- a/xos-services/vspgwc/templates/deployment.yaml
+++ b/xos-services/vspgwc/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/vspgwc/values.yaml b/xos-services/vspgwc/values.yaml
index 8fca902..e4f627d 100644
--- a/xos-services/vspgwc/values.yaml
+++ b/xos-services/vspgwc/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/vspgwc-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/vspgwc-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -41,7 +40,6 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
 
 resources: {}
 
diff --git a/xos-services/vspgwu/Chart.yaml b/xos-services/vspgwu/Chart.yaml
index 9cee6e7..40f5bb8 100644
--- a/xos-services/vspgwu/Chart.yaml
+++ b/xos-services/vspgwu/Chart.yaml
@@ -15,7 +15,4 @@
 
 name: vspgwu
 description: A Helm chart for XOS's "vspgwu" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
+version: 1.0.0
diff --git a/xos-services/vspgwu/templates/_helpers.tpl b/xos-services/vspgwu/templates/_helpers.tpl
index 242c329..b017551 100644
--- a/xos-services/vspgwu/templates/_helpers.tpl
+++ b/xos-services/vspgwu/templates/_helpers.tpl
@@ -62,17 +62,11 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.vspgwu
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 blueprints:
   - name: cord_5_0_blueprint
diff --git a/xos-services/vspgwu/templates/deployment.yaml b/xos-services/vspgwu/templates/deployment.yaml
index a6d3bdc..3f1d49f 100644
--- a/xos-services/vspgwu/templates/deployment.yaml
+++ b/xos-services/vspgwu/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/vspgwu/values.yaml b/xos-services/vspgwu/values.yaml
index 9a41837..3afd361 100644
--- a/xos-services/vspgwu/values.yaml
+++ b/xos-services/vspgwu/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/vspgwu-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/vspgwu-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -41,7 +40,6 @@
 global:
   proxySshEnabled: true
   proxySshUser: "root"
-  registry: ''
 
 resources: {}
 
diff --git a/xos-services/vtn-service/Chart.yaml b/xos-services/vtn-service/Chart.yaml
index d6097fd..aa8b039 100644
--- a/xos-services/vtn-service/Chart.yaml
+++ b/xos-services/vtn-service/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: vtn-service
 description: A Helm chart for XOS's "vtn-service" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
-
+version: 1.0.0
diff --git a/xos-services/vtn-service/templates/_helpers.tpl b/xos-services/vtn-service/templates/_helpers.tpl
index 22e1457..ee8abf6 100644
--- a/xos-services/vtn-service/templates/_helpers.tpl
+++ b/xos-services/vtn-service/templates/_helpers.tpl
@@ -62,16 +62,10 @@
       filename: /var/log/xos.log
       maxBytes: 10485760
       backupCount: 5
-    kafka:
-      class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
-      bootstrap_servers:
-        - "cord-kafka:9092"
-      topic: xos.log.vtn-service
   loggers:
     'multistructlog':
       handlers:
         - console
         - file
-        - kafka
       level: DEBUG
 {{- end -}}
diff --git a/xos-services/vtn-service/templates/deployment.yaml b/xos-services/vtn-service/templates/deployment.yaml
index ccecd3a..d18dcc4 100644
--- a/xos-services/vtn-service/templates/deployment.yaml
+++ b/xos-services/vtn-service/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.vtn_synchronizerImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-services/vtn-service/values.yaml b/xos-services/vtn-service/values.yaml
index f15fd29..6c25d21 100644
--- a/xos-services/vtn-service/values.yaml
+++ b/xos-services/vtn-service/values.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default values for VTN
+# Default values for TTN
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/vtn-synchronizer'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ''
+vtn_synchronizerImage: "xosproject/vtn-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"