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"