diff --git a/examples/adminuser-values.yaml b/examples/adminuser-values.yaml
index 3ff85ee..6f45295 100644
--- a/examples/adminuser-values.yaml
+++ b/examples/adminuser-values.yaml
@@ -22,40 +22,19 @@
 xosAdminUser: &adminuser "cordadmin@foobar.com"
 xosAdminPassword: &adminpass "AVerySecurePassword"
 
-# initial_data_config is a list.
-# I don’t know how to override individual list items...
-configs:
-  initial_data_config:
-    - model: core.Site
-      fields:
-        name: "mysite"
-        abbreviated_name: "mysite"
-        login_base: "mysite"
-        site_url: "http://opencord.org/"
-        hosts_nodes: true
-    - model: core.User
-      fields:
-        email: *adminuser
-        password: *adminpass
-        firstname: "XOS"
-        lastname: "User"
-        is_admin: True
-      relations:
-        site:
-          fields:
-            name: "mysite"
-          model: core.Site
-
-serviceOverride: &serviceOverride
-  serviceConfig:
-    accessor:
-      username: *adminuser
-      password: *adminpass
-
-
 # Update the username / password for all the services
-addressmanager: *serviceOverride
-fabric:         *serviceOverride
-onos-service:   *serviceOverride
-volt:           *serviceOverride
-vsg-hw:         *serviceOverride
+addressmanager:
+  xosAdminUser: *adminuser
+  xosAdminPassword: *adminpass
+fabric:
+  xosAdminUser: *adminuser
+  xosAdminPassword: *adminpass
+onos-service:
+  xosAdminUser: *adminuser
+  xosAdminPassword: *adminpass
+volt:
+  xosAdminUser: *adminuser
+  xosAdminPassword: *adminpass
+vsg-hw:
+  xosAdminUser: *adminuser
+  xosAdminPassword: *adminpass
diff --git a/examples/candidate-tag-values.yaml b/examples/candidate-tag-values.yaml
index 73eb790..803616b 100644
--- a/examples/candidate-tag-values.yaml
+++ b/examples/candidate-tag-values.yaml
@@ -16,38 +16,25 @@
 
 # Set all image tags to "candidate" to use imagebuilder's local images
 
-images:
-  xos_core:
-    tag: 'candidate'
-  xos_gui:
-    tag: 'candidate'
-  xos_db:
-    tag: 'candidate'
-  xos_tosca:
-    tag: 'candidate'
-  xos_chameleon:
-    tag: 'candidate'
-  xos_ws:
-    tag: 'candidate'
-  api_tester:
-    tag: 'candidate'
+# in xos-core chart
+xos_coreImage: 'xosproject/xos-core:candidate'
+xos_chameleonImage: 'xosproject/chameleon:candidate'
+xos_guiImage: 'xosproject/xos-gui:candidate'
+xos_toscaImage: 'xosproject/xos-tosca:candidate'
+xos_wsImage: 'xosproject/xos-ws:candidate'
+xos_api_testerImage: 'xosproject/xos-api-tester:candidate'
 
-image:
-  rcordSynchronizer:
-    tag: 'candidate'
+# in rcord-lite chart
+rcord_synchronizerImage: "xosproject/rcord-synchronizer:candidate"
 
+# in service charts
 addressmanager:
-  image:
-    tag: 'candidate'
+  addressmanager_synchronizerImage: "xosproject/addressmanager-synchronizer:candidate"
 fabric:
-  image:
-    tag: 'candidate'
+  fabric_synchronizerImage: "xosproject/fabric-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'
\ No newline at end of file
+  vsg_hw_synchronizerImage: "xosproject/vsg-hw-synchronizer:candidate"
diff --git a/examples/onos-nodeport-values.yaml b/examples/onos-nodeport-values.yaml
index a28052e..73aef5e 100644
--- a/examples/onos-nodeport-values.yaml
+++ b/examples/onos-nodeport-values.yaml
@@ -19,7 +19,10 @@
 # helm install -f examples/onos-nodeport-values.yaml onos
 
 services:
-  serviceType: NodePort
+  openflowServiceType: NodePort
+  ovsdbServiceType: NodePort
+  sshServiceType: NodePort
+  uiServiceType: NodePort
   ovsdb:
     nodePort: 31640
   openflow:
diff --git a/examples/pull-always-values.yaml b/examples/pull-always-values.yaml
index 21a3803..ab3135b 100644
--- a/examples/pull-always-values.yaml
+++ b/examples/pull-always-values.yaml
@@ -16,38 +16,17 @@
 
 # Set all image tags to "candidate" to use imagebuilder's local images
 
-images:
-  xos_core:
-    pullPolicy: 'Always'
-  xos_gui:
-    pullPolicy: 'Always'
-  xos_db:
-    pullPolicy: 'Always'
-  xos_tosca:
-    pullPolicy: 'Always'
-  xos_chameleon:
-    pullPolicy: 'Always'
-  xos_ws:
-    pullPolicy: 'Always'
-  api_tester:
-    pullPolicy: 'Always'
+# in xos-core and rcord-lite charts
+imagePullPolicy: 'Always'
 
-image:
-  rcordSynchronizer:
-    pullPolicy: 'Always'
-
+# in service charts
 addressmanager:
-  image:
-    pullPolicy: 'Always'
+  imagePullPolicy: 'Always'
 fabric:
-  image:
-    pullPolicy: 'Always'
+  imagePullPolicy: 'Always'
 onos-service:
-  image:
-    pullPolicy: 'Always'
+  imagePullPolicy: 'Always'
 volt:
-  image:
-    pullPolicy: 'Always'
+  imagePullPolicy: 'Always'
 vsg-hw:
-  image:
-    pullPolicy: 'Always'
\ No newline at end of file
+  imagePullPolicy: 'Always'