diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index b9b1487..73156ad 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 name: xos-core
-version: 1.0.0
+version: 2.0.0
diff --git a/xos-core/requirements.yaml b/xos-core/requirements.yaml
index f77c942..d751508 100644
--- a/xos-core/requirements.yaml
+++ b/xos-core/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
 - name: xos-gui
-  version: 0.1.0
+  version: 1.0.0
   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 df280b5..d61cdd9 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -28,7 +28,7 @@
     spec:
       containers:
         - name: xos-chameleon
-          image: {{ .Values.xos_chameleonImage | quote }}
+          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:
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index 64bf9f6..54b2a5a 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.yaml
@@ -28,7 +28,7 @@
     spec:
       containers:
         - name: xos-core
-          image: {{ .Values.xos_coreImage | quote }}
+          image: {{ tpl .Values.xos_coreImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: ["/bin/bash", "-c", "cd coreapi; ./start_coreapi.sh"]
           ports:
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 6cb8a46..c6e5105 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -24,10 +24,10 @@
 
 # Docker images
 # YAML variable names can't contain `-`, so substituted with `_`
-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'
+xos_coreImage: 'xosproject/xos-core:{{ .Chart.Version }}'
+xos_chameleonImage: 'xosproject/chameleon:{{ .Chart.Version }}'
+xos_toscaImage: 'xosproject/xos-tosca:1.0.1'
+xos_api_testerImage: 'xosproject/xos-api-tester:2.0.1'
 
 postgresImage: 'postgres:10.3-alpine'
 nodeImage: 'node:7.9.0'
diff --git a/xos-gui/Chart.yaml b/xos-gui/Chart.yaml
index c60ee86..b919e6b 100644
--- a/xos-gui/Chart.yaml
+++ b/xos-gui/Chart.yaml
@@ -13,9 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: Web GUI for XOS
 name: xos-gui
-version: 0.1.0
+description: Web GUI for XOS
+version: 1.0.0
 
diff --git a/xos-gui/templates/gui-deployment.yaml b/xos-gui/templates/gui-deployment.yaml
index f14cf7f..153a6bf 100644
--- a/xos-gui/templates/gui-deployment.yaml
+++ b/xos-gui/templates/gui-deployment.yaml
@@ -28,7 +28,7 @@
     spec:
       containers:
         - name: xos-gui
-          image: {{ .Values.xos_guiImage | quote }}
+          image: {{ tpl .Values.xos_guiImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           ports:
             - containerPort: 4000
diff --git a/xos-gui/values.yaml b/xos-gui/values.yaml
index e2101b4..ffbf443 100644
--- a/xos-gui/values.yaml
+++ b/xos-gui/values.yaml
@@ -16,8 +16,8 @@
 imagePullPolicy: 'Always'
 
 # Docker Images
-xos_guiImage: 'xosproject/xos-gui:master'
-xos_wsImage: 'xosproject/xos-ws:master'
+xos_guiImage: 'xosproject/xos-gui:{{ .Chart.Version }}'
+xos_wsImage: 'xosproject/xos-ws:1.0.0'
 
 # NodePorts
 xos_guiNodePort: 30001
diff --git a/xos-profiles/base-kubernetes/requirements.yaml b/xos-profiles/base-kubernetes/requirements.yaml
index 2f9fb87..4215534 100644
--- a/xos-profiles/base-kubernetes/requirements.yaml
+++ b/xos-profiles/base-kubernetes/requirements.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +15,7 @@
 
 dependencies:
 - name: kubernetes
-  version: 0.1.0
+  version: 1.0.0
   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 ded25f3..9502ecc 100644
--- a/xos-profiles/base-kubernetes/templates/tosca-job.yaml
+++ b/xos-profiles/base-kubernetes/templates/tosca-job.yaml
@@ -36,7 +36,7 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.tosca_loaderImage | quote }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index a9e490d..b0d50e1 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -24,8 +24,7 @@
 
 imagePullPolicy: 'IfNotPresent'
 
-rcord_synchronizerImage: "xosproject/rcord-synchronizer:master"
-tosca_loaderImage: "xosproject/tosca-loader:master"
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index e0705b4..4c465e3 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
 - name: onos-service
-  version: 0.1.0
+  version: 2.0.0
   repository: file://../../xos-services/onos-service
 - name: openstack
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/openstack
 - name: vtn-service
-  version: 0.1.0
+  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 764595c..0b009e3 100644
--- a/xos-profiles/base-openstack/templates/tosca-job.yaml
+++ b/xos-profiles/base-openstack/templates/tosca-job.yaml
@@ -35,7 +35,7 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.tosca_loaderImage | quote }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
diff --git a/xos-profiles/base-openstack/values.yaml b/xos-profiles/base-openstack/values.yaml
index d5c1d86..11cb5a8 100644
--- a/xos-profiles/base-openstack/values.yaml
+++ b/xos-profiles/base-openstack/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-tosca_loaderImage: "xosproject/tosca-loader:master"
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/demo-exampleservice/requirements.yaml b/xos-profiles/demo-exampleservice/requirements.yaml
index 1db6f54..4da802b 100644
--- a/xos-profiles/demo-exampleservice/requirements.yaml
+++ b/xos-profiles/demo-exampleservice/requirements.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +15,8 @@
 
 dependencies:
 - name: exampleservice
-  version: 0.1.0
+  version: 2.1.0
   repository: file://../../xos-services/exampleservice
 - name: addressmanager
-  version: 0.1.0
+  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 e08cf33..0bba3f6 100644
--- a/xos-profiles/demo-exampleservice/templates/tosca-job.yaml
+++ b/xos-profiles/demo-exampleservice/templates/tosca-job.yaml
@@ -35,7 +35,7 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.tosca_loaderImage | quote }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
diff --git a/xos-profiles/demo-exampleservice/values.yaml b/xos-profiles/demo-exampleservice/values.yaml
index eccf195..e621e99 100644
--- a/xos-profiles/demo-exampleservice/values.yaml
+++ b/xos-profiles/demo-exampleservice/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'IfNotPresent'
 
-tosca_loaderImage: "xosproject/tosca-loader:master"
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/demo-simpleexampleservice/requirements.yaml b/xos-profiles/demo-simpleexampleservice/requirements.yaml
index dcd90c4..eccfaa9 100644
--- a/xos-profiles/demo-simpleexampleservice/requirements.yaml
+++ b/xos-profiles/demo-simpleexampleservice/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
 - name: simpleexampleservice
-  version: 0.1.0
+  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 3c5380d..0a05d11 100644
--- a/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
+++ b/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
@@ -35,7 +35,7 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.tosca_loaderImage | quote }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
diff --git a/xos-profiles/demo-simpleexampleservice/values.yaml b/xos-profiles/demo-simpleexampleservice/values.yaml
index 1a4c19a..bc25efa 100644
--- a/xos-profiles/demo-simpleexampleservice/values.yaml
+++ b/xos-profiles/demo-simpleexampleservice/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'IfNotPresent'
 
-tosca_loaderImage: "xosproject/tosca-loader:master"
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-profiles/mcord/requirements.yaml b/xos-profiles/mcord/requirements.yaml
index 354f514..568264f 100644
--- a/xos-profiles/mcord/requirements.yaml
+++ b/xos-profiles/mcord/requirements.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,32 +15,32 @@
 
 dependencies:
 - name: vmme
-  version: 0.1.0
+  version: 1.0.1
   repository: file://../../xos-services/vmme
 - name: vspgwc
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/vspgwc
 - name: vspgwu
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/vspgwu
 - name: vhss
-  version: 0.1.0
+  version: 1.0.1
   repository: file://../../xos-services/vhss
 - name: hssdb
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/hssdb
 - name: internetemulator
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/internetemulator
 - name: sdncontroller
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/sdncontroller
 - name: epc-service
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/epc-service
 - name: mcord-subscriber
-  version: 0.1.0
+  version: 2.0.0
   repository: file://../../xos-services/mcord-subscriber
 - name: progran
-  version: 0.1.0
-  repository: file://../../xos-services/progran
\ No newline at end of file
+  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 4410b85..f407543 100644
--- a/xos-profiles/mcord/templates/tosca-job.yaml
+++ b/xos-profiles/mcord/templates/tosca-job.yaml
@@ -35,7 +35,7 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.tosca_loaderImage | quote }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index 9c0b385..380fff8 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'IfNotPresent'
 
-tosca_loaderImage: "xosproject/tosca-loader:master"
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
 xosAdminUser: &adminuser "admin@opencord.org"
 xosAdminPassword: &adminpass "letmein"
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index 2068c7d..262f9c0 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,20 +15,20 @@
 
 dependencies:
 - name: rcord
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/rcord
 - name: onos-service
-  version: 0.1.0
+  version: 2.0.0
   repository: file://../../xos-services/onos-service
 - name: fabric
-  version: 0.1.0
+  version: 2.0.0
   repository: file://../../xos-services/fabric
 - name: volt
-  version: 0.1.0
+  version: 2.0.0
   repository: file://../../xos-services/volt
 - name: vsg-hw
-  version: 0.1.0
+  version: 1.0.0
   repository: file://../../xos-services/vsg-hw
 - name: vrouter
-  version: 0.1.0
+  version: 2.0.0
   repository: file://../../xos-services/vrouter
diff --git a/xos-profiles/rcord-lite/templates/tosca-job.yaml b/xos-profiles/rcord-lite/templates/tosca-job.yaml
index ae4f9da..1405e45 100644
--- a/xos-profiles/rcord-lite/templates/tosca-job.yaml
+++ b/xos-profiles/rcord-lite/templates/tosca-job.yaml
@@ -36,7 +36,7 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.tosca_loaderImage | quote }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index e0b0cd6..a60b34c 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -24,10 +24,9 @@
 
 imagePullPolicy: 'Always'
 
-rcord_synchronizerImage: "xosproject/rcord-synchronizer:master"
-tosca_loaderImage: "xosproject/tosca-loader:master"
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
 
-xos_api_testerImage: 'xosproject/xos-api-tester:master'
+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 3dfc46b..8598325 100644
--- a/xos-services/addressmanager/Chart.yaml
+++ b/xos-services/addressmanager/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "addressmanager" service
 name: addressmanager
-version: 0.1.0
+description: A Helm chart for XOS's "addressmanager" service
+version: 2.0.0
diff --git a/xos-services/addressmanager/templates/deployment.yaml b/xos-services/addressmanager/templates/deployment.yaml
index 003aad0..7610ca4 100644
--- a/xos-services/addressmanager/templates/deployment.yaml
+++ b/xos-services/addressmanager/templates/deployment.yaml
@@ -39,7 +39,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.addressmanager_synchronizerImage | quote }}
+          image: {{ tpl .Values.addressmanager_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/addressmanager/values.yaml b/xos-services/addressmanager/values.yaml
index 2e936a6..eb570da 100644
--- a/xos-services/addressmanager/values.yaml
+++ b/xos-services/addressmanager/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-addressmanager_synchronizerImage: "xosproject/addressmanager-synchronizer:master"
+addressmanager_synchronizerImage: "xosproject/addressmanager-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/epc-service/Chart.yaml b/xos-services/epc-service/Chart.yaml
index 4258ed4..47e6af6 100644
--- a/xos-services/epc-service/Chart.yaml
+++ b/xos-services/epc-service/Chart.yaml
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "epc-service" service
 name: epc-service
-version: 0.1.0
+description: A Helm chart for XOS's "epc-service" service
+version: 1.0.0
diff --git a/xos-services/epc-service/templates/deployment.yaml b/xos-services/epc-service/templates/deployment.yaml
index 1a0ddcd..f6e7203 100644
--- a/xos-services/epc-service/templates/deployment.yaml
+++ b/xos-services/epc-service/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/epc-service/values.yaml b/xos-services/epc-service/values.yaml
index c14342f..1bbf5be 100644
--- a/xos-services/epc-service/values.yaml
+++ b/xos-services/epc-service/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/vepc-synchronizer:master"
+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 9262ce4..cf29f5d 100644
--- a/xos-services/exampleservice/Chart.yaml
+++ b/xos-services/exampleservice/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "exampleservice" service
 name: exampleservice
-version: 0.1.0
+description: A Helm chart for XOS's "exampleservice" service
+version: 2.1.0
diff --git a/xos-services/exampleservice/templates/deployment.yaml b/xos-services/exampleservice/templates/deployment.yaml
index e8fac2f..4fdce2f 100644
--- a/xos-services/exampleservice/templates/deployment.yaml
+++ b/xos-services/exampleservice/templates/deployment.yaml
@@ -36,7 +36,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.exampleservice_synchronizerImage | quote }}
+          image: {{ tpl .Values.exampleservice_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/exampleservice/values.yaml b/xos-services/exampleservice/values.yaml
index a10289d..3ae9782 100644
--- a/xos-services/exampleservice/values.yaml
+++ b/xos-services/exampleservice/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-exampleservice_synchronizerImage: "xosproject/exampleservice-synchronizer:master"
+exampleservice_synchronizerImage: "xosproject/exampleservice-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/fabric/Chart.yaml b/xos-services/fabric/Chart.yaml
index e8a59d4..1d47c5e 100644
--- a/xos-services/fabric/Chart.yaml
+++ b/xos-services/fabric/Chart.yaml
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "fabric" service
 name: fabric
-version: 0.1.0
+description: A Helm chart for XOS's "fabric" service
+version: 2.0.0
diff --git a/xos-services/fabric/templates/deployment.yaml b/xos-services/fabric/templates/deployment.yaml
index be332e0..031abc1 100644
--- a/xos-services/fabric/templates/deployment.yaml
+++ b/xos-services/fabric/templates/deployment.yaml
@@ -39,7 +39,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.fabric_synchronizerImage | quote }}
+          image: {{ tpl .Values.fabric_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/fabric/values.yaml b/xos-services/fabric/values.yaml
index a134d8d..c0d63ac 100644
--- a/xos-services/fabric/values.yaml
+++ b/xos-services/fabric/values.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-fabric_synchronizerImage: "xosproject/fabric-synchronizer:master"
+fabric_synchronizerImage: "xosproject/fabric-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
@@ -37,4 +36,3 @@
 tolerations: []
 
 affinity: {}
-
diff --git a/xos-services/hippie-oss/Chart.yaml b/xos-services/hippie-oss/Chart.yaml
index 5bf1244..7acba09 100644
--- a/xos-services/hippie-oss/Chart.yaml
+++ b/xos-services/hippie-oss/Chart.yaml
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "hippie-oss" service
 name: hippie-oss
-version: 0.1.0
+description: A Helm chart for XOS's "hippie-oss" service
+version: 1.0.0
diff --git a/xos-services/hippie-oss/templates/deployment.yaml b/xos-services/hippie-oss/templates/deployment.yaml
index 811fb8a..03c262f 100644
--- a/xos-services/hippie-oss/templates/deployment.yaml
+++ b/xos-services/hippie-oss/templates/deployment.yaml
@@ -39,7 +39,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.hippieOSS_synchronizerImage | quote }}
+          image: {{ tpl .Values.hippieOSS_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/hippie-oss/values.yaml b/xos-services/hippie-oss/values.yaml
index 109987a..3e49089 100644
--- a/xos-services/hippie-oss/values.yaml
+++ b/xos-services/hippie-oss/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-hippieOSS_synchronizerImage: "xosproject/hippie-oss-synchronizer:master"
+hippieOSS_synchronizerImage: "xosproject/hippie-oss-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/hssdb/Chart.yaml b/xos-services/hssdb/Chart.yaml
index 62e5ae8..08c1ec0 100644
--- a/xos-services/hssdb/Chart.yaml
+++ b/xos-services/hssdb/Chart.yaml
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "hssdb" service
 name: hssdb
-version: 0.1.0
+description: A Helm chart for XOS's "hssdb" service
+version: 1.0.0
diff --git a/xos-services/hssdb/templates/deployment.yaml b/xos-services/hssdb/templates/deployment.yaml
index 1e8489c..ece871e 100644
--- a/xos-services/hssdb/templates/deployment.yaml
+++ b/xos-services/hssdb/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/hssdb/values.yaml b/xos-services/hssdb/values.yaml
index 701f2fc..c412926 100644
--- a/xos-services/hssdb/values.yaml
+++ b/xos-services/hssdb/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/hssdb-synchronizer:master"
+synchronizerImage: "xosproject/hssdb-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/internetemulator/Chart.yaml b/xos-services/internetemulator/Chart.yaml
index b1577bf..188d767 100644
--- a/xos-services/internetemulator/Chart.yaml
+++ b/xos-services/internetemulator/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "internetemulator" service
 name: internetemulator
-version: 0.1.0
+description: A Helm chart for XOS's "internetemulator" service
+version: 1.0.0
diff --git a/xos-services/internetemulator/templates/deployment.yaml b/xos-services/internetemulator/templates/deployment.yaml
index 1377a16..33e24ce 100644
--- a/xos-services/internetemulator/templates/deployment.yaml
+++ b/xos-services/internetemulator/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/internetemulator/values.yaml b/xos-services/internetemulator/values.yaml
index 255a284..4a21056 100644
--- a/xos-services/internetemulator/values.yaml
+++ b/xos-services/internetemulator/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/internetemulator-synchronizer:master"
+synchronizerImage: "xosproject/internetemulator-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/kubernetes/Chart.yaml b/xos-services/kubernetes/Chart.yaml
index 7776549..121f46f 100644
--- a/xos-services/kubernetes/Chart.yaml
+++ b/xos-services/kubernetes/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "kubernetes" service
 name: kubernetes
-version: 0.1.0
+description: A Helm chart for XOS's "kubernetes" service
+version: 1.0.0
diff --git a/xos-services/kubernetes/templates/deployment.yaml b/xos-services/kubernetes/templates/deployment.yaml
index 575e941..b09a459 100644
--- a/xos-services/kubernetes/templates/deployment.yaml
+++ b/xos-services/kubernetes/templates/deployment.yaml
@@ -40,7 +40,7 @@
       serviceAccountName: kubernetes-synchronizer
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.kubernetes_synchronizerImage | quote }}
+          image: {{ tpl .Values.kubernetes_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/kubernetes/values.yaml b/xos-services/kubernetes/values.yaml
index 5491c50..15e6f52 100644
--- a/xos-services/kubernetes/values.yaml
+++ b/xos-services/kubernetes/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:master"
+kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/mcord-subscriber/Chart.yaml b/xos-services/mcord-subscriber/Chart.yaml
index 0e2506a..ab2afd4 100644
--- a/xos-services/mcord-subscriber/Chart.yaml
+++ b/xos-services/mcord-subscriber/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "mcord-subscriber" service
 name: mcord-subscriber
-version: 0.1.0
+description: A Helm chart that creates a subscriber for the "mcord" service
+version: 2.0.0
diff --git a/xos-services/mcord-subscriber/templates/job.yaml b/xos-services/mcord-subscriber/templates/job.yaml
index 8e24663..ab6051a 100644
--- a/xos-services/mcord-subscriber/templates/job.yaml
+++ b/xos-services/mcord-subscriber/templates/job.yaml
@@ -34,7 +34,7 @@
       restartPolicy: Never
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/mcord-subscriber/values.yaml b/xos-services/mcord-subscriber/values.yaml
index 9e0de15..8889d0f 100644
--- a/xos-services/mcord-subscriber/values.yaml
+++ b/xos-services/mcord-subscriber/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/mcord-synchronizer:master"
+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 fba2fb8..e82959b 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
 description: A Helm chart for XOS's "onos-service" service, which configures ONOS
 name: onos-service
-version: 0.1.0
+version: 2.0.0
diff --git a/xos-services/onos-service/templates/deployment.yaml b/xos-services/onos-service/templates/deployment.yaml
index 4741338..967d501 100644
--- a/xos-services/onos-service/templates/deployment.yaml
+++ b/xos-services/onos-service/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.onos_synchronizerImage | quote }}
+          image: {{ tpl .Values.onos_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 22c723b..7d9fcc5 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-onos_synchronizerImage: "xosproject/onos-synchronizer:master"
+onos_synchronizerImage: "xosproject/onos-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/openstack/Chart.yaml b/xos-services/openstack/Chart.yaml
index 0e8058c..bd187f7 100644
--- a/xos-services/openstack/Chart.yaml
+++ b/xos-services/openstack/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "openstack" service
 name: openstack
-version: 0.1.0
+description: A Helm chart for XOS's "openstack" service
+version: 1.0.0
diff --git a/xos-services/openstack/templates/deployment.yaml b/xos-services/openstack/templates/deployment.yaml
index 8fa8c9c..6b985f5 100644
--- a/xos-services/openstack/templates/deployment.yaml
+++ b/xos-services/openstack/templates/deployment.yaml
@@ -39,7 +39,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.openstack_synchronizerImage | quote }}
+          image: {{ tpl .Values.openstack_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/openstack/values.yaml b/xos-services/openstack/values.yaml
index 5c99b7a..bf45148 100644
--- a/xos-services/openstack/values.yaml
+++ b/xos-services/openstack/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-openstack_synchronizerImage: "xosproject/openstack-synchronizer:master"
+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 0110cbf..0d386c3 100644
--- a/xos-services/progran/Chart.yaml
+++ b/xos-services/progran/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "progran" service
 name: progran
-version: 0.1.0
+description: A Helm chart for XOS's "progran" service
+version: 2.0.0
diff --git a/xos-services/progran/templates/deployment.yaml b/xos-services/progran/templates/deployment.yaml
index 1e6096c..7671550 100644
--- a/xos-services/progran/templates/deployment.yaml
+++ b/xos-services/progran/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/progran/values.yaml b/xos-services/progran/values.yaml
index e7c0418..e26b6fa 100644
--- a/xos-services/progran/values.yaml
+++ b/xos-services/progran/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/progran-synchronizer:master"
+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 c6e0c37..c9ded13 100644
--- a/xos-services/rcord/Chart.yaml
+++ b/xos-services/rcord/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "rcord" service
 name: rcord
-version: 0.1.0
+description: A Helm chart for XOS's "rcord" service
+version: 1.0.0
diff --git a/xos-services/rcord/templates/deployment.yaml b/xos-services/rcord/templates/deployment.yaml
index 0233fc4..de345b3 100644
--- a/xos-services/rcord/templates/deployment.yaml
+++ b/xos-services/rcord/templates/deployment.yaml
@@ -39,7 +39,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.rcord_synchronizerImage | quote }}
+          image: {{ tpl .Values.rcord_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/rcord/values.yaml b/xos-services/rcord/values.yaml
index 7d41776..de32940 100644
--- a/xos-services/rcord/values.yaml
+++ b/xos-services/rcord/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-rcord_synchronizerImage: "xosproject/rcord-synchronizer:master"
+rcord_synchronizerImage: "xosproject/rcord-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/sdncontroller/Chart.yaml b/xos-services/sdncontroller/Chart.yaml
index 9391a04..d928666 100644
--- a/xos-services/sdncontroller/Chart.yaml
+++ b/xos-services/sdncontroller/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "sdncontroller" service
 name: sdncontroller
-version: 0.1.0
+description: A Helm chart for XOS's "sdncontroller" service
+version: 1.0.0
diff --git a/xos-services/sdncontroller/templates/deployment.yaml b/xos-services/sdncontroller/templates/deployment.yaml
index 221f308..f28559b 100644
--- a/xos-services/sdncontroller/templates/deployment.yaml
+++ b/xos-services/sdncontroller/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/sdncontroller/values.yaml b/xos-services/sdncontroller/values.yaml
index b6392cc..64a493a 100644
--- a/xos-services/sdncontroller/values.yaml
+++ b/xos-services/sdncontroller/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/sdncontroller-synchronizer:master"
+synchronizerImage: "xosproject/sdncontroller-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/simpleexampleservice/Chart.yaml b/xos-services/simpleexampleservice/Chart.yaml
index 81a4546..0a88434 100644
--- a/xos-services/simpleexampleservice/Chart.yaml
+++ b/xos-services/simpleexampleservice/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "simpleexampleservice" service
 name: simpleexampleservice
-version: 0.1.0
+description: A Helm chart for XOS's "simpleexampleservice" service
+version: 1.0.0
diff --git a/xos-services/simpleexampleservice/templates/deployment.yaml b/xos-services/simpleexampleservice/templates/deployment.yaml
index 314dba9..05b69eb 100644
--- a/xos-services/simpleexampleservice/templates/deployment.yaml
+++ b/xos-services/simpleexampleservice/templates/deployment.yaml
@@ -36,7 +36,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.simpleexampleservice_synchronizerImage | quote }}
+          image: {{ tpl .Values.simpleexampleservice_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/simpleexampleservice/values.yaml b/xos-services/simpleexampleservice/values.yaml
index 5505af7..ea818a0 100644
--- a/xos-services/simpleexampleservice/values.yaml
+++ b/xos-services/simpleexampleservice/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-simpleexampleservice_synchronizerImage: "xosproject/simpleexampleservice-synchronizer:master"
+simpleexampleservice_synchronizerImage: "xosproject/simpleexampleservice-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vhss/Chart.yaml b/xos-services/vhss/Chart.yaml
index 928b60b..6de9a24 100644
--- a/xos-services/vhss/Chart.yaml
+++ b/xos-services/vhss/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "vhss" service
 name: vhss
-version: 0.1.0
+description: A Helm chart for XOS's "vhss" service
+version: 1.0.1
diff --git a/xos-services/vhss/templates/deployment.yaml b/xos-services/vhss/templates/deployment.yaml
index 6f1baf8..e697547 100644
--- a/xos-services/vhss/templates/deployment.yaml
+++ b/xos-services/vhss/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/vhss/values.yaml b/xos-services/vhss/values.yaml
index 4eee01c..e188e13 100644
--- a/xos-services/vhss/values.yaml
+++ b/xos-services/vhss/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/vhss-synchronizer:master"
+synchronizerImage: "xosproject/vhss-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vmme/Chart.yaml b/xos-services/vmme/Chart.yaml
index 0823879..9469ede 100644
--- a/xos-services/vmme/Chart.yaml
+++ b/xos-services/vmme/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "vmme" service
 name: vmme
-version: 0.1.0
+description: A Helm chart for XOS's "vmme" service
+version: 1.0.1
diff --git a/xos-services/vmme/templates/deployment.yaml b/xos-services/vmme/templates/deployment.yaml
index 5be3e82..783084f 100644
--- a/xos-services/vmme/templates/deployment.yaml
+++ b/xos-services/vmme/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/vmme/values.yaml b/xos-services/vmme/values.yaml
index ed82da4..b6d6358 100644
--- a/xos-services/vmme/values.yaml
+++ b/xos-services/vmme/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/vmme-synchronizer:master"
+synchronizerImage: "xosproject/vmme-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/volt/Chart.yaml b/xos-services/volt/Chart.yaml
index 6257488..b8a6777 100644
--- a/xos-services/volt/Chart.yaml
+++ b/xos-services/volt/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "olt-service" service
 name: volt
-version: 0.1.0
+description: A Helm chart for XOS's "olt-service" service
+version: 2.0.0
diff --git a/xos-services/volt/templates/deployment.yaml b/xos-services/volt/templates/deployment.yaml
index cb04c03..eb20190 100644
--- a/xos-services/volt/templates/deployment.yaml
+++ b/xos-services/volt/templates/deployment.yaml
@@ -39,7 +39,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.volt_synchronizerImage | quote }}
+          image: {{ tpl .Values.volt_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/volt/values.yaml b/xos-services/volt/values.yaml
index 9762096..26b5f7e 100644
--- a/xos-services/volt/values.yaml
+++ b/xos-services/volt/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-volt_synchronizerImage: "xosproject/volt-synchronizer:master"
+volt_synchronizerImage: "xosproject/volt-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vrouter/Chart.yaml b/xos-services/vrouter/Chart.yaml
index 29f15d0..b224c32 100644
--- a/xos-services/vrouter/Chart.yaml
+++ b/xos-services/vrouter/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "vRouter" service
 name: vrouter
-version: 0.1.0
+description: A Helm chart for XOS's "vRouter" service
+version: 2.0.0
diff --git a/xos-services/vrouter/templates/deployment.yaml b/xos-services/vrouter/templates/deployment.yaml
index 8c3eba3..f04837e 100644
--- a/xos-services/vrouter/templates/deployment.yaml
+++ b/xos-services/vrouter/templates/deployment.yaml
@@ -39,7 +39,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.vrouter_synchronizerImage | quote }}
+          image: {{ tpl .Values.vrouter_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/vrouter/values.yaml b/xos-services/vrouter/values.yaml
index 5264a2c..2d99c10 100644
--- a/xos-services/vrouter/values.yaml
+++ b/xos-services/vrouter/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-vrouter_synchronizerImage: "xosproject/vrouter-synchronizer:master"
+vrouter_synchronizerImage: "xosproject/vrouter-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vsg-hw/Chart.yaml b/xos-services/vsg-hw/Chart.yaml
index 1aae162..d7346b7 100644
--- a/xos-services/vsg-hw/Chart.yaml
+++ b/xos-services/vsg-hw/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "vsg-hw" service
 name: vsg-hw
-version: 0.1.0
+description: A Helm chart for XOS's "vsg-hw" service
+version: 1.0.0
diff --git a/xos-services/vsg-hw/templates/deployment.yaml b/xos-services/vsg-hw/templates/deployment.yaml
index d81cc16..ba7fe62 100644
--- a/xos-services/vsg-hw/templates/deployment.yaml
+++ b/xos-services/vsg-hw/templates/deployment.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.vsg_hw_synchronizerImage | quote }}
+          image: {{ tpl .Values.vsg_hw_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/vsg-hw/values.yaml b/xos-services/vsg-hw/values.yaml
index 35fffcf..43b15fa 100644
--- a/xos-services/vsg-hw/values.yaml
+++ b/xos-services/vsg-hw/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-vsg_hw_synchronizerImage: "xosproject/vsg-hw-synchronizer:master"
+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 d4e1d28..5314b07 100644
--- a/xos-services/vspgwc/Chart.yaml
+++ b/xos-services/vspgwc/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "vspgwc" service
 name: vspgwc
-version: 0.1.0
+description: A Helm chart for XOS's "vspgwc" service
+version: 1.0.0
diff --git a/xos-services/vspgwc/templates/deployment.yaml b/xos-services/vspgwc/templates/deployment.yaml
index a180f0a..061191a 100644
--- a/xos-services/vspgwc/templates/deployment.yaml
+++ b/xos-services/vspgwc/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/vspgwc/values.yaml b/xos-services/vspgwc/values.yaml
index ecb6c61..e4f627d 100644
--- a/xos-services/vspgwc/values.yaml
+++ b/xos-services/vspgwc/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/vspgwc-synchronizer:master"
+synchronizerImage: "xosproject/vspgwc-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vspgwu/Chart.yaml b/xos-services/vspgwu/Chart.yaml
index 0604959..40f5bb8 100644
--- a/xos-services/vspgwu/Chart.yaml
+++ b/xos-services/vspgwu/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "vspgwu" service
 name: vspgwu
-version: 0.1.0
+description: A Helm chart for XOS's "vspgwu" service
+version: 1.0.0
diff --git a/xos-services/vspgwu/templates/deployment.yaml b/xos-services/vspgwu/templates/deployment.yaml
index 7fee01a..3f1d49f 100644
--- a/xos-services/vspgwu/templates/deployment.yaml
+++ b/xos-services/vspgwu/templates/deployment.yaml
@@ -38,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.synchronizerImage | quote }}
+          image: {{ tpl .Values.synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/vspgwu/values.yaml b/xos-services/vspgwu/values.yaml
index ad4a277..3afd361 100644
--- a/xos-services/vspgwu/values.yaml
+++ b/xos-services/vspgwu/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-synchronizerImage: "xosproject/vspgwu-synchronizer:master"
+synchronizerImage: "xosproject/vspgwu-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/vtn-service/Chart.yaml b/xos-services/vtn-service/Chart.yaml
index 8e3ea89..aa8b039 100644
--- a/xos-services/vtn-service/Chart.yaml
+++ b/xos-services/vtn-service/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for XOS's "vtn-service" service
 name: vtn-service
-version: 0.1.0
+description: A Helm chart for XOS's "vtn-service" service
+version: 1.0.0
diff --git a/xos-services/vtn-service/templates/deployment.yaml b/xos-services/vtn-service/templates/deployment.yaml
index e76115f..d18dcc4 100644
--- a/xos-services/vtn-service/templates/deployment.yaml
+++ b/xos-services/vtn-service/templates/deployment.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +38,7 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.vtn_synchronizerImage | quote }}
+          image: {{ tpl .Values.vtn_synchronizerImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-services/vtn-service/values.yaml b/xos-services/vtn-service/values.yaml
index 49d5af5..6c25d21 100644
--- a/xos-services/vtn-service/values.yaml
+++ b/xos-services/vtn-service/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-vtn_synchronizerImage: "xosproject/vtn-synchronizer:master"
+vtn_synchronizerImage: "xosproject/vtn-synchronizer:{{ .Chart.Version }}"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-tools/xossh/Chart.yaml b/xos-tools/xossh/Chart.yaml
index 00bfe0a..fe2df9d 100644
--- a/xos-tools/xossh/Chart.yaml
+++ b/xos-tools/xossh/Chart.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for xossh
 name: xossh
-version: 0.1.0
+description: A Helm chart for xossh, the XOS command line shell
+version: 2.0.0
diff --git a/xos-tools/xossh/templates/deployment.yaml b/xos-tools/xossh/templates/deployment.yaml
index 3c20f86..0e9540a 100644
--- a/xos-tools/xossh/templates/deployment.yaml
+++ b/xos-tools/xossh/templates/deployment.yaml
@@ -47,7 +47,7 @@
                - "{{ .Values.xosshConfig.accessor.endpoint }}"
           stdin: true
           tty: true
-          image: "{{ .Values.xosshImage }}"
+          image: {{ tpl .Values.xosshImage . | quote }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/xos-tools/xossh/values.yaml b/xos-tools/xossh/values.yaml
index a1ff5f5..ff07162 100644
--- a/xos-tools/xossh/values.yaml
+++ b/xos-tools/xossh/values.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +26,7 @@
 
 imagePullPolicy: Always
 
-xosshImage: 'xosproject/xos-client:master'
+xosshImage: "xosproject/xos-client:{{ .Chart.Version }}"
 
 resources: {}