diff --git a/examples/image-tag-candidate.yaml b/examples/image-tag-candidate.yaml
index 6c023f0..e1b9c27 100644
--- a/examples/image-tag-candidate.yaml
+++ b/examples/image-tag-candidate.yaml
@@ -14,111 +14,74 @@
 # limitations under the License.
 
 # Set all image tags to "candidate" to use locally built images
-image:
-  tag: 'candidate'
 
-# in xos-core chart and other charts with multiple images
-images:
-  xos_core:
-    tag: 'candidate'
-  xos_chameleon:
-    tag: 'candidate'
-  xos_tosca:
-    tag: 'candidate'
-  xos_api_tester:
-    tag: 'candidate'
-  tosca_loader:
-    tag: 'candidate'
+# in xos-core chart
+xos_coreImage: 'xosproject/xos-core:candidate'
+xos_chameleonImage: 'xosproject/chameleon:candidate'
+xos_toscaImage: 'xosproject/xos-tosca:candidate'
+xos_api_testerImage: 'xosproject/xos-api-tester:candidate'
+tosca_loaderImage: 'xosproject/tosca-loader:candidate'
 
 # in xos-gui sub-chart required by xos-core chart
 xos-gui:
-  images:
-    xos_gui:
-      tag: 'candidate'
-    xos_ws:
-      tag: 'candidate'
+  xos_guiImage: 'xosproject/xos-gui:candidate'
+  xos_wsImage: 'xosproject/xos-ws:candidate'
 
 # in RCORD service chart
 addressmanager:
-  image:
-    tag: 'candidate'
+  addressmanager_synchronizerImage: 'xosproject/addressmanager-synchronizer:candidate'
 att-workflow-driver:
-  image:
-    tag: 'candidate'
+  attWorkflowDriver_synchronizerImage: 'xosproject/att-workflow-driver-synchronizer:candidate'
 fabric:
-  image:
-    tag: 'candidate'
+  fabric_synchronizerImage: 'xosproject/fabric-synchronizer:candidate'
 fabric-crossconnect:
-  image:
-    tag: 'candidate'
+  fabric_crossconnect_synchronizerImage: 'xosproject/fabric-crossconnect-synchronizer:candidate'
 onos-service:
-  image:
-    tag: 'candidate'
+  onos_synchronizerImage: 'xosproject/onos-synchronizer:candidate'
 volt:
-  image:
-    tag: 'candidate'
+  volt_synchronizerImage: 'xosproject/volt-synchronizer:candidate'
 vsg-hw:
-  image:
-    tag: 'candidate'
+  vsg_hw_synchronizerImage: 'xosproject/vsg-hw-synchronizer:candidate'
 vrouter:
-  image:
-    tag: 'candidate'
+  vrouter_synchronizerImage: 'xosproject/vrouter-synchronizer:candidate'
 rcord:
-  image:
-    tag: 'candidate'
+  rcord_synchronizerImage: 'xosproject/rcord-synchronizer:candidate'
 
 # in BASE-OPENSTACK chart
 openstack:
-  image:
-    tag: 'candidate'
-
+  openstack_synchronizerImage: 'xosproject/openstack-synchronizer:candidate'
 vtn-service:
-  image:
-    tag: 'candidate'
+  vtn_synchronizerImage: 'xosproject/vtn-synchronizer:candidate'
 
 # in MCORD
 vmme:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/vmme-synchronizer:candidate"
 vspgwc:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/vspgwc-synchronizer:candidate"
 vspgwu:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/vspgwu-synchronizer:candidate"
 vhss:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/vhss-synchronizer:candidate"
 hssdb:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/hssdb-synchronizer:candidate"
 internetemulator:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/internetemulator-synchronizer:candidate"
 sdncontroller:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/sdncontroller-synchronizer:candidate"
 epc-service:
-  image:
-    tag: 'candidate'
-k8spcservice:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/vepc-synchronizer:candidate"
 mcord-subscriber:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/mcord-synchronizer:candidate"
 progran:
-  image:
-    tag: 'candidate'
+  synchronizerImage: "xosproject/progran-synchronizer:candidate"
 
-# others
+# others  
 kubernetes:
-  image:
-    tag: 'candidate'
+  kubernetes_synchronizerImage: 'xosproject/kubernetes-synchronizer:candidate'
 exampleservice:
-  image:
-    tag: 'candidate'
+  exampleservice_synchronizerImage: 'xosproject/exampleservice-synchronizer:candidate'
 simpleexampleservice:
-  image:
-    tag: 'candidate'
+  simpleexampleservice_synchronizerImage: 'xosproject/simpleexampleservice-synchronizer:candidate'
+
+hippieOSS_synchronizerImage: 'xosproject/hippie-oss-synchronizer:candidate'
 
diff --git a/examples/imagePullPolicy-IfNotPresent.yaml b/examples/imagePullPolicy-IfNotPresent.yaml
index 31e6f32..2cadc2d 100644
--- a/examples/imagePullPolicy-IfNotPresent.yaml
+++ b/examples/imagePullPolicy-IfNotPresent.yaml
@@ -16,94 +16,62 @@
 # Only pull docker images if not already present
 
 # in xos-core, rcord-lite, onos and voltha charts
-image:
-  pullPolicy: 'IfNotPresent'
-
+imagePullPolicy: 'IfNotPresent'
 xos-gui:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 
 # in RCORD service chart
 addressmanager:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 att-workflow-driver:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 fabric:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 fabric-crossconnect:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 onos-service:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 volt:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 vsg-hw:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 rcord:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 vrouter:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 
 # in BASE-OPENSTACK chart
 openstack:
-  image:
-    pullPolicy: 'IfNotPresent'
-
+  imagePullPolicy: 'IfNotPresent'
 vtn-service:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 
 # in MCORD
 vmme:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 vspgwc:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 vspgwu:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 vhss:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 hssdb:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 internetemulator:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 sdncontroller:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 epc-service:
-  image:
-    pullPolicy: 'IfNotPresent'
-k8sepcservice:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 mcord-subscriber:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 progran:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 
 # others
 kubernetes:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 exampleservice:
-  image:
-    pullPolicy: 'IfNotPresent'
+  imagePullPolicy: 'IfNotPresent'
 simpleexampleservice:
-  image:
-    pullPolicy: 'IfNotPresent'
-
+  imagePullPolicy: 'IfNotPresent'
\ No newline at end of file
diff --git a/sadis-server/Chart.yaml b/sadis-server/Chart.yaml
index ea3f0e1..985e029 100644
--- a/sadis-server/Chart.yaml
+++ b/sadis-server/Chart.yaml
@@ -13,5 +13,4 @@
 # limitations under the License.
 
 name: sadis-server
-version: 1.0.1
-appVersion: latest
+version: 1.0.0-dev
diff --git a/sadis-server/templates/sadis-deployment.yaml b/sadis-server/templates/sadis-deployment.yaml
index 36a14f9..9e2c882 100644
--- a/sadis-server/templates/sadis-deployment.yaml
+++ b/sadis-server/templates/sadis-deployment.yaml
@@ -29,8 +29,8 @@
     spec:
       containers:
         - name: sadis-server
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ .Values.image }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           ports:
             - containerPort: 8000
               port: 8000
diff --git a/sadis-server/values.yaml b/sadis-server/values.yaml
index 7c3cea9..f65a8bc 100644
--- a/sadis-server/values.yaml
+++ b/sadis-server/values.yaml
@@ -12,14 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-image:
-  repository: 'opencord/sadis-server'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
-
-global:
-  registry: ''
+image: "opencord/sadis-server:latest"
+imagePullPolicy: Always
 
 xosAdminUser: "admin@opencord.org"
-xosAdminPassword: "letmein"
+xosAdminPassword: "letmein"
\ No newline at end of file
diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index d47d9c1..350aa64 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -14,12 +14,4 @@
 # limitations under the License.
 
 name: xos-core
-description: XOS - An Extensible Cloud Operating System
-icon: https://guide.opencord.org/logos/xos.svg
-
-version: 2.1.15
-
-# appVersion is of the xos-core and xos-chameleon containers.
-# xos-tosca and xos-api-tester are versioned in values.yaml
-appVersion: 2.1.15
-
+version: 2.1.0-dev
diff --git a/xos-core/requirements.yaml b/xos-core/requirements.yaml
index de38084..2d165b1 100644
--- a/xos-core/requirements.yaml
+++ b/xos-core/requirements.yaml
@@ -15,10 +15,10 @@
 
 dependencies:
 - name: xos-db
-  version: 1.0.0
+  version: 0.1.0-dev0
   repository: file://../xos-db
 - name: xos-gui
-  version: 1.2.0
+  version: 1.1.0-dev
   repository: file://../xos-gui
   condition: xos-gui.enabled
 
diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index 41f1f6e..d61cdd9 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-chameleon
-          image:  {{ .Values.global.registry }}{{ .Values.images.xos_chameleon.repository }}:{{ tpl .Values.images.xos_chameleon.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_chameleon.pullPolicy }}
+          image: {{ tpl .Values.xos_chameleonImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: ["python", "chameleon/chameleon/main.py", "-R", "9101", "-G", "xos-core:50055", "--swagger-url", "/apidocs", "-r"]
           ports:
             - containerPort: 9101
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index a785392..54b2a5a 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-core
-          image: {{ .Values.global.registry }}{{ .Values.images.xos_core.repository }}:{{ tpl .Values.images.xos_core.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_core.pullPolicy }}
+          image: {{ tpl .Values.xos_coreImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: ["/bin/bash", "-c", "cd coreapi; ./start_coreapi.sh"]
           ports:
             - containerPort: 50051
diff --git a/xos-core/templates/tests/test-xos-core-api.yaml b/xos-core/templates/tests/test-xos-core-api.yaml
index 1162de0..7899b00 100644
--- a/xos-core/templates/tests/test-xos-core-api.yaml
+++ b/xos-core/templates/tests/test-xos-core-api.yaml
@@ -25,8 +25,8 @@
   restartPolicy: Never
   containers:
     - name: {{ .Release.Name }}-api-test
-      image: {{ .Values.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
-      imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
+      image: {{ .Values.xos_api_testerImage }}
+      imagePullPolicy: {{ .Values.imagePullPolicy }}
       volumeMounts:
         - name: log-volume
           mountPath: /src/cord-api/Tests/Log/
diff --git a/xos-core/templates/tosca-deployment.yaml b/xos-core/templates/tosca-deployment.yaml
index c6f8376..48eecf2 100644
--- a/xos-core/templates/tosca-deployment.yaml
+++ b/xos-core/templates/tosca-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-tosca
-          image: {{ .Values.global.registry }}{{ .Values.images.xos_tosca.repository }}:{{ tpl .Values.images.xos_tosca.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_tosca.pullPolicy }}
+          image: {{ .Values.xos_toscaImage | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           ports:
             - containerPort: 9102
               port: 9102
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 688f379..7f315bc 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -16,31 +16,14 @@
 xos_gui:
   enabled: true
 
+imagePullPolicy: 'Always'
+
 # Docker images
 # YAML variable names can't contain `-`, so substituted with `_`
-images:
-  xos_core:
-    repository: 'xosproject/xos-core'
-    tag: '{{ .Chart.AppVersion }}'
-    pullPolicy: 'Always'
-
-  xos_chameleon:
-    repository: 'xosproject/chameleon'
-    tag: '{{ .Chart.AppVersion }}'
-    pullPolicy: 'Always'
-
-  xos_tosca:
-    repository: 'xosproject/xos-tosca'
-    tag: '1.1.1'
-    pullPolicy: 'Always'
-
-  xos_api_tester:
-    repository: 'xosproject/xos-api-tester'
-    tag: '2.0.3'
-    pullPolicy: 'Always'
-
-global:
-  registry: ""
+xos_coreImage: 'xosproject/xos-core:master'
+xos_chameleonImage: 'xosproject/chameleon:master'
+xos_toscaImage: 'xosproject/xos-tosca:master'
+xos_api_testerImage: 'xosproject/xos-api-tester:master'
 
 # NodePorts
 xos_chameleonNodePort: 30006
diff --git a/xos-db/Chart.yaml b/xos-db/Chart.yaml
index e66aac5..677cbc9 100644
--- a/xos-db/Chart.yaml
+++ b/xos-db/Chart.yaml
@@ -14,9 +14,4 @@
 # limitations under the License.
 
 name: xos-db
-version: 1.0.0
-
-icon: https://www.postgresql.org/media/img/about/press/elephant.png
-
-# Postgres container from: https://hub.docker.com/_/postgres/
-appVersion: '10.3-alpine'
+version: 0.1.0-dev0
diff --git a/xos-db/templates/db-deployment.yaml b/xos-db/templates/db-deployment.yaml
index d467b05..a3d3e91 100644
--- a/xos-db/templates/db-deployment.yaml
+++ b/xos-db/templates/db-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-db
-          image:  {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ .Values.postgresImage | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           ports:
             - containerPort: 5432
               protocol: TCP
diff --git a/xos-db/values.yaml b/xos-db/values.yaml
index 8428769..8bb026d 100644
--- a/xos-db/values.yaml
+++ b/xos-db/values.yaml
@@ -15,13 +15,8 @@
 
 # XOS Postgres database related values
 
-image:
-  repository: 'postgres'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
-
-global:
-  registry: ""
+imagePullPolicy: 'Always'
+postgresImage: 'postgres:10.3-alpine'
 
 # Database name/username/password
 xosDBName: 'xos'
diff --git a/xos-gui/Chart.yaml b/xos-gui/Chart.yaml
index 9f379f8..a1efce3 100644
--- a/xos-gui/Chart.yaml
+++ b/xos-gui/Chart.yaml
@@ -15,8 +15,5 @@
 
 name: xos-gui
 description: Web GUI for XOS
-icon: https://guide.opencord.org/logos/xos.svg
-version: 1.2.0
+version: 1.1.0-dev
 
-# appVersion is of the xos-gui container, xos-ws tag is specified in values.yaml
-appVersion: 1.0.2
diff --git a/xos-gui/templates/gui-deployment.yaml b/xos-gui/templates/gui-deployment.yaml
index d8d8b13..153a6bf 100644
--- a/xos-gui/templates/gui-deployment.yaml
+++ b/xos-gui/templates/gui-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-gui
-          image: {{ .Values.global.registry }}{{ .Values.images.xos_gui.repository }}:{{ tpl .Values.images.xos_gui.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_gui.pullPolicy }}
+          image: {{ tpl .Values.xos_guiImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           ports:
             - containerPort: 4000
               port: 4000
diff --git a/xos-gui/templates/ws-deployment.yaml b/xos-gui/templates/ws-deployment.yaml
index e10d0f8..9d958bb 100644
--- a/xos-gui/templates/ws-deployment.yaml
+++ b/xos-gui/templates/ws-deployment.yaml
@@ -28,8 +28,8 @@
     spec:
       containers:
         - name: xos-ws
-          image: {{ .Values.global.registry }}{{ .Values.images.xos_ws.repository }}:{{ tpl .Values.images.xos_ws.tag . }}
-          imagePullPolicy: {{ .Values.images.xos_ws.pullPolicy }}
+          image: {{ .Values.xos_wsImage | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: ["npm", "start", "--", "--config", "gateway-config.yml"]
           ports:
             - containerPort: 3000
diff --git a/xos-gui/values.yaml b/xos-gui/values.yaml
index 7e54158..4ea2e9d 100644
--- a/xos-gui/values.yaml
+++ b/xos-gui/values.yaml
@@ -13,20 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+imagePullPolicy: 'Always'
+
 # Docker Images
-images:
-  xos_gui:
-    repository: 'xosproject/xos-gui'
-    tag: "{{ .Chart.AppVersion }}"
-    pullPolicy: 'Always'
-
-  xos_ws:
-    repository: 'xosproject/xos-ws'
-    tag: '2.0.0'
-    pullPolicy: 'Always'
-
-global:
-  registry: ""
+xos_guiImage: 'xosproject/xos-gui:master'
+xos_wsImage: 'xosproject/xos-ws:master'
 
 # NodePorts
 xos_guiNodePort: 30001
diff --git a/xos-profiles/att-workflow/Chart.yaml b/xos-profiles/att-workflow/Chart.yaml
index e42858f..242f5e6 100644
--- a/xos-profiles/att-workflow/Chart.yaml
+++ b/xos-profiles/att-workflow/Chart.yaml
@@ -15,11 +15,7 @@
 # limitations under the License.
 
 apiVersion: v1
-name: att-workflow
+appVersion: "1.0"
 description: A Helm chart for XOS's "att-workflow" profile
-icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
-
+name: att-workflow
+version: 0.1.0
diff --git a/xos-profiles/att-workflow/requirements.yaml b/xos-profiles/att-workflow/requirements.yaml
index 8824396..8357af0 100644
--- a/xos-profiles/att-workflow/requirements.yaml
+++ b/xos-profiles/att-workflow/requirements.yaml
@@ -15,23 +15,23 @@
 
 dependencies:
 - name: rcord
-  version: 1.0.4
+  version: 1.1.0-dev
   repository: file://../../xos-services/rcord
 - name: onos-service
-  version: 2.0.5
+  version: 2.0.2-dev
   repository: file://../../xos-services/onos-service
 - name: fabric
-  version: 2.1.3
+  version: 2.0.1-dev
   repository: file://../../xos-services/fabric
 - name: volt
-  version: 2.1.1
+  version: 2.0.2-dev
   repository: file://../../xos-services/volt
 - name: fabric-crossconnect
-  version: 1.1.1
+  version: 1.0.0-dev
   repository: file://../../xos-services/fabric-crossconnect
 - name: att-workflow-driver
-  version: 1.0.2
+  version: 1.0.0-dev
   repository: file://../../xos-services/att-workflow-driver
 - name: sadis-server
-  version: 1.0.1
+  version: 1.0.0-dev
   repository: file://../../sadis-server
diff --git a/xos-profiles/att-workflow/templates/tests/test-att-workflow.yaml b/xos-profiles/att-workflow/templates/tests/test-att-workflow.yaml
index f029cf3..6e93795 100644
--- a/xos-profiles/att-workflow/templates/tests/test-att-workflow.yaml
+++ b/xos-profiles/att-workflow/templates/tests/test-att-workflow.yaml
@@ -23,8 +23,8 @@
   restartPolicy: Never
   containers:
     - name: {{ .Release.Name }}-api-test
-      image: {{ .Values.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
-      imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
+      image: {{ .Values.xos_api_testerImage }}
+      imagePullPolicy: {{ .Values.imagePullPolicy }}
       volumeMounts:
         - name: log-volume
           mountPath: /src/cord-api/Tests/Log/
diff --git a/xos-profiles/att-workflow/templates/tosca-job.yaml b/xos-profiles/att-workflow/templates/tosca-job.yaml
index a51aaf7..792a56c 100644
--- a/xos-profiles/att-workflow/templates/tosca-job.yaml
+++ b/xos-profiles/att-workflow/templates/tosca-job.yaml
@@ -36,8 +36,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.images.tosca_loader.repository }}:{{ tpl .Values.images.tosca_loader.tag . }}
-          imagePullPolicy: {{ .Values.images.tosca_loader.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/att-workflow/values.yaml b/xos-profiles/att-workflow/values.yaml
index 8ab7539..10dc007 100644
--- a/xos-profiles/att-workflow/values.yaml
+++ b/xos-profiles/att-workflow/values.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default values for the att-workflow profile.
+# Default values for the rcord-fc profile.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -22,19 +22,11 @@
 nameOverride: ""
 fullnameOverride: ""
 
-images:
-  tosca_loader:
-    repository: 'xosproject/tosca-loader'
-    tag: '{{ .Chart.AppVersion }}'
-    pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
 
-  xos_api_tester:
-    repository: 'xosproject/xos-api-tester'
-    tag: '2.0.3'
-    pullPolicy: 'Always'
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
-global:
-  registry: ""
+xos_api_testerImage: 'xosproject/xos-api-tester:master'
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/base-kubernetes/Chart.yaml b/xos-profiles/base-kubernetes/Chart.yaml
index e404344..71e6297 100644
--- a/xos-profiles/base-kubernetes/Chart.yaml
+++ b/xos-profiles/base-kubernetes/Chart.yaml
@@ -14,11 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: base-kubernetes
+apiVersion: v1
+appVersion: "1.0"
 description: A Helm chart for XOS's "base-kubernetes" profile
-icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
-
+name: base-kubernetes
+version: 0.1.0
diff --git a/xos-profiles/base-kubernetes/requirements.yaml b/xos-profiles/base-kubernetes/requirements.yaml
index ff2de09..6d0ea7e 100644
--- a/xos-profiles/base-kubernetes/requirements.yaml
+++ b/xos-profiles/base-kubernetes/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
 - name: kubernetes
-  version: 1.0.4
+  version: 1.0.1-dev
   repository: file://../../xos-services/kubernetes
 
 
diff --git a/xos-profiles/base-kubernetes/templates/tosca-job.yaml b/xos-profiles/base-kubernetes/templates/tosca-job.yaml
index 4578761..9502ecc 100644
--- a/xos-profiles/base-kubernetes/templates/tosca-job.yaml
+++ b/xos-profiles/base-kubernetes/templates/tosca-job.yaml
@@ -36,8 +36,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index ac6cb1c..8521140 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -22,14 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-# tosca loader container
-image:
-  repository: 'xosproject/tosca-loader'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
 
-global:
-  registry: ""
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/base-openstack/Chart.yaml b/xos-profiles/base-openstack/Chart.yaml
index d95aa4b..e6003da 100644
--- a/xos-profiles/base-openstack/Chart.yaml
+++ b/xos-profiles/base-openstack/Chart.yaml
@@ -15,9 +15,7 @@
 # limitations under the License.
 
 apiVersion: v1
+appVersion: "1.0"
 description: A Helm chart for the "base-openstack" profile
 name: base-openstack
 version: 0.1.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index 7c93104..7f2578a 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
 - name: onos-service
-  version: 2.0.5
+  version: 2.0.2-dev
   repository: file://../../xos-services/onos-service
 - name: openstack
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/openstack
 - name: vtn-service
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/vtn-service
diff --git a/xos-profiles/base-openstack/templates/tosca-job.yaml b/xos-profiles/base-openstack/templates/tosca-job.yaml
index 48d0b9e..0b009e3 100644
--- a/xos-profiles/base-openstack/templates/tosca-job.yaml
+++ b/xos-profiles/base-openstack/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/base-openstack/values.yaml b/xos-profiles/base-openstack/values.yaml
index 8a9d1c8..11cb5a8 100644
--- a/xos-profiles/base-openstack/values.yaml
+++ b/xos-profiles/base-openstack/values.yaml
@@ -22,14 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-# tosca loader container
-image:
-  repository: 'xosproject/tosca-loader'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-global:
-  registry: ""
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/demo-exampleservice/Chart.yaml b/xos-profiles/demo-exampleservice/Chart.yaml
index 201b1d5..926af58 100644
--- a/xos-profiles/demo-exampleservice/Chart.yaml
+++ b/xos-profiles/demo-exampleservice/Chart.yaml
@@ -1,4 +1,5 @@
 ---
+
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,12 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: demo-exampleservice
+apiVersion: v1
+appVersion: "1.0"
 description: A Helm chart that launches and configures ExampleService. It's assumed that base-kubernetes profile is installed.
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
-
+name: demo-exampleservice
+version: 0.1.0
diff --git a/xos-profiles/demo-exampleservice/requirements.yaml b/xos-profiles/demo-exampleservice/requirements.yaml
index 207d073..4da802b 100644
--- a/xos-profiles/demo-exampleservice/requirements.yaml
+++ b/xos-profiles/demo-exampleservice/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
 - name: exampleservice
-  version: 2.1.1
+  version: 2.1.0
   repository: file://../../xos-services/exampleservice
 - name: addressmanager
-  version: 2.0.1
+  version: 2.0.0
   repository: file://../../xos-services/addressmanager
diff --git a/xos-profiles/demo-exampleservice/templates/tosca-job.yaml b/xos-profiles/demo-exampleservice/templates/tosca-job.yaml
index 53cce60..0bba3f6 100644
--- a/xos-profiles/demo-exampleservice/templates/tosca-job.yaml
+++ b/xos-profiles/demo-exampleservice/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/demo-exampleservice/values.yaml b/xos-profiles/demo-exampleservice/values.yaml
index 496a20f..e621e99 100644
--- a/xos-profiles/demo-exampleservice/values.yaml
+++ b/xos-profiles/demo-exampleservice/values.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default values for the demo-exampleservice profile.
+# Default values for the base-openstack profile.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/tosca-loader'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
+
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -40,4 +39,3 @@
 global:
   proxySshEnabled: true
   proxySshUser: root
-  registry: ''
diff --git a/xos-profiles/demo-simpleexampleservice/Chart.yaml b/xos-profiles/demo-simpleexampleservice/Chart.yaml
index 18da6cd..10e3b26 100644
--- a/xos-profiles/demo-simpleexampleservice/Chart.yaml
+++ b/xos-profiles/demo-simpleexampleservice/Chart.yaml
@@ -14,11 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: demo-simpleexampleservice
+apiVersion: v1
+appVersion: "1.0"
 description: A Helm chart that launches and configures SimpleExampleService. It's assumed that base-kubernetes profile is installed.
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
+name: demo-simpleexampleservice
+version: 0.1.0
diff --git a/xos-profiles/demo-simpleexampleservice/requirements.yaml b/xos-profiles/demo-simpleexampleservice/requirements.yaml
index 91ca512..eccfaa9 100644
--- a/xos-profiles/demo-simpleexampleservice/requirements.yaml
+++ b/xos-profiles/demo-simpleexampleservice/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
 - name: simpleexampleservice
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/simpleexampleservice
diff --git a/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml b/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
index 7e9c65c..0a05d11 100644
--- a/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
+++ b/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/demo-simpleexampleservice/values.yaml b/xos-profiles/demo-simpleexampleservice/values.yaml
index 2fbe1f6..bc25efa 100644
--- a/xos-profiles/demo-simpleexampleservice/values.yaml
+++ b/xos-profiles/demo-simpleexampleservice/values.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default values for the demo-simpleexampleservice profile.
+# Default values for the base-openstack profile.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/tosca-loader'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
 
-global:
-  registry: ''
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 2c49deb..5fa482b 100644
--- a/xos-profiles/mcord/Chart.yaml
+++ b/xos-profiles/mcord/Chart.yaml
@@ -1,4 +1,5 @@
 ---
+
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,9 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: mcord
+apiVersion: v1
+appVersion: "1.0"
 description: A Helm chart for the "mcord" profile
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
+name: mcord
+version: 0.1.0
diff --git a/xos-profiles/mcord/requirements.yaml b/xos-profiles/mcord/requirements.yaml
index 12b4c93..568264f 100644
--- a/xos-profiles/mcord/requirements.yaml
+++ b/xos-profiles/mcord/requirements.yaml
@@ -15,32 +15,32 @@
 
 dependencies:
 - name: vmme
-  version: 1.0.2
+  version: 1.0.1
   repository: file://../../xos-services/vmme
 - name: vspgwc
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/vspgwc
 - name: vspgwu
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/vspgwu
 - name: vhss
-  version: 1.0.2
+  version: 1.0.1
   repository: file://../../xos-services/vhss
 - name: hssdb
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/hssdb
 - name: internetemulator
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/internetemulator
 - name: sdncontroller
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/sdncontroller
 - name: epc-service
-  version: 1.1.1
+  version: 1.0.0
   repository: file://../../xos-services/epc-service
 - name: mcord-subscriber
-  version: 2.0.1
+  version: 2.0.0
   repository: file://../../xos-services/mcord-subscriber
 - name: progran
-  version: 2.0.2
+  version: 2.0.0
   repository: file://../../xos-services/progran
diff --git a/xos-profiles/mcord/templates/tosca-job.yaml b/xos-profiles/mcord/templates/tosca-job.yaml
index ed6ae54..f407543 100644
--- a/xos-profiles/mcord/templates/tosca-job.yaml
+++ b/xos-profiles/mcord/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index b6d3a18..380fff8 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -22,10 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/tosca-loader'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
+
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: &adminuser "admin@opencord.org"
 xosAdminPassword: &adminpass "letmein"
@@ -41,4 +40,3 @@
 global:
   proxySshEnabled: true
   proxySshUser: root
-  registry: ''
diff --git a/xos-profiles/ponsim-pod/Chart.yaml b/xos-profiles/ponsim-pod/Chart.yaml
index 2b58e77..157e299 100644
--- a/xos-profiles/ponsim-pod/Chart.yaml
+++ b/xos-profiles/ponsim-pod/Chart.yaml
@@ -13,9 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: ponsim-pod
+apiVersion: v1
+appVersion: "1.0"
 description: A Helm chart for loading the Ponsim pod's TOSCA files into XOS
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
+name: ponsim-pod
+version: 0.1.0
diff --git a/xos-profiles/ponsim-pod/templates/tosca-job.yaml b/xos-profiles/ponsim-pod/templates/tosca-job.yaml
index 92d4cd1..6099ad3 100644
--- a/xos-profiles/ponsim-pod/templates/tosca-job.yaml
+++ b/xos-profiles/ponsim-pod/templates/tosca-job.yaml
@@ -37,8 +37,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-ponsim-pod
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/ponsim-pod/values.yaml b/xos-profiles/ponsim-pod/values.yaml
index e6ac302..981c10f 100644
--- a/xos-profiles/ponsim-pod/values.yaml
+++ b/xos-profiles/ponsim-pod/values.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default values for the ponsim-pod profile.
+# Default values for the rcord-fc profile.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -22,13 +22,9 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/tosca-loader'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
 
-global:
-  registry: ''
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/rcord-lite/Chart.yaml b/xos-profiles/rcord-lite/Chart.yaml
index 88b7ab4..5c4972c 100644
--- a/xos-profiles/rcord-lite/Chart.yaml
+++ b/xos-profiles/rcord-lite/Chart.yaml
@@ -1,4 +1,5 @@
 ---
+
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,10 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: rcord-lite
+apiVersion: v1
+appVersion: "1.0"
 description: A Helm chart for XOS's "rcord-lite" profile
-icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
+name: rcord-lite
+version: 0.1.0
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index f1398ee..33417bb 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -15,23 +15,23 @@
 
 dependencies:
 - name: rcord
-  version: 1.0.4
+  version: 1.1.0-dev
   repository: file://../../xos-services/rcord
 - name: onos-service
-  version: 2.0.5
+  version: 2.0.2-dev
   repository: file://../../xos-services/onos-service
 - name: fabric
-  version: 2.1.3
+  version: 2.0.1-dev
   repository: file://../../xos-services/fabric
 - name: volt
-  version: 2.1.1
+  version: 2.0.2-dev
   repository: file://../../xos-services/volt
 - name: vsg-hw
-  version: 1.0.1
+  version: 1.0.0
   repository: file://../../xos-services/vsg-hw
 - name: vrouter
-  version: 2.0.3
+  version: 2.0.1-dev
   repository: file://../../xos-services/vrouter
 - name: sadis-server
-  version: 1.0.1
+  version: 1.0.0-dev
   repository: file://../../sadis-server
diff --git a/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml b/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml
index a17884f..7781c53 100644
--- a/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml
+++ b/xos-profiles/rcord-lite/templates/tests/test-rcord-lite-api.yaml
@@ -23,8 +23,8 @@
   restartPolicy: Never
   containers:
     - name: {{ .Release.Name }}-api-test
-      image: {{ .Values.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
-      imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
+      image: {{ .Values.xos_api_testerImage }}
+      imagePullPolicy: {{ .Values.imagePullPolicy }}
       volumeMounts:
         - name: log-volume
           mountPath: /src/cord-api/Tests/Log/
diff --git a/xos-profiles/rcord-lite/templates/tosca-job.yaml b/xos-profiles/rcord-lite/templates/tosca-job.yaml
index d1a83a2..1405e45 100644
--- a/xos-profiles/rcord-lite/templates/tosca-job.yaml
+++ b/xos-profiles/rcord-lite/templates/tosca-job.yaml
@@ -36,8 +36,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.images.tosca_loader.repository }}:{{ tpl .Values.images.tosca_loader.tag . }}
-          imagePullPolicy: {{ .Values.images.tosca_loader.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 65e3396..1cb4941 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -22,19 +22,11 @@
 nameOverride: ""
 fullnameOverride: ""
 
-images:
-  tosca_loader:
-    repository: 'xosproject/tosca-loader'
-    tag: '{{ .Chart.AppVersion }}'
-    pullPolicy: 'Always'
+imagePullPolicy: 'Always'
 
-  xos_api_tester:
-    repository: 'xosproject/xos-api-tester'
-    tag: '2.0.3'
-    pullPolicy: 'Always'
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
-global:
-  registry: ''
+xos_api_testerImage: 'xosproject/xos-api-tester:2.0.1'
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
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"
diff --git a/xos-tools/kafkacat/Chart.yaml b/xos-tools/kafkacat/Chart.yaml
index 39e9fb5..dadfad4 100644
--- a/xos-tools/kafkacat/Chart.yaml
+++ b/xos-tools/kafkacat/Chart.yaml
@@ -15,9 +15,4 @@
 
 name: kafkacat
 description: A Helm chart for kafkacat
-icon: https://kafka.apache.org/images/logo.png
-
-version: 1.0.0
-
-# version of confluentinc/cp-kafkacat container
-appVersion: 4.1.2
+version: 1.0.0-dev
diff --git a/xos-tools/kafkacat/templates/deployment.yaml b/xos-tools/kafkacat/templates/deployment.yaml
index de219c9..5a16db5 100644
--- a/xos-tools/kafkacat/templates/deployment.yaml
+++ b/xos-tools/kafkacat/templates/deployment.yaml
@@ -1,4 +1,5 @@
 ---
+
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,6 +37,6 @@
     spec:
       containers:
         - name: kafkacat
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.kafkacatImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: ["/bin/bash", "-c", "sleep 86400"]
diff --git a/xos-tools/kafkacat/values.yaml b/xos-tools/kafkacat/values.yaml
index 6b96e1b..ae6d055 100644
--- a/xos-tools/kafkacat/values.yaml
+++ b/xos-tools/kafkacat/values.yaml
@@ -19,16 +19,11 @@
 
 replicaCount: 1
 
+pull_docker_registry:
+
 nameOverride: ""
 fullnameOverride: ""
 
 imagePullPolicy: Always
 
-image:
-  repository: 'confluentinc/cp-kafkacat'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
-
-global:
-  registry: ''
-
+kafkacatImage: "confluentinc/cp-kafkacat:4.0.2"
diff --git a/xos-tools/xossh/Chart.yaml b/xos-tools/xossh/Chart.yaml
index 814a6bb..22858d3 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/xos-tools/xossh/Chart.yaml
@@ -15,8 +15,4 @@
 
 name: xossh
 description: A Helm chart for xossh, the XOS command line shell
-icon: https://guide.opencord.org/logos/xos.svg
-version: 2.1.15
-
-# Runs the xosproject/xos-client container
-appVersion: 2.1.15
+version: 2.1.0-dev
diff --git a/xos-tools/xossh/templates/deployment.yaml b/xos-tools/xossh/templates/deployment.yaml
index 44af9ff..0e9540a 100644
--- a/xos-tools/xossh/templates/deployment.yaml
+++ b/xos-tools/xossh/templates/deployment.yaml
@@ -47,8 +47,8 @@
                - "{{ .Values.xosshConfig.accessor.endpoint }}"
           stdin: true
           tty: true
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.xosshImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
diff --git a/xos-tools/xossh/values.yaml b/xos-tools/xossh/values.yaml
index e8d03b8..2ae231d 100644
--- a/xos-tools/xossh/values.yaml
+++ b/xos-tools/xossh/values.yaml
@@ -19,16 +19,14 @@
 
 replicaCount: 1
 
+pull_docker_registry:
+
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: 'xosproject/xos-client'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+imagePullPolicy: Always
 
-global:
-  registry: ''
+xosshImage: "xosproject/xos-client:master"
 
 resources: {}