diff --git a/kubernetes-configs/bbwf.yml b/kubernetes-configs/bbwf.yml
index 78881be..8b34ab4 100644
--- a/kubernetes-configs/bbwf.yml
+++ b/kubernetes-configs/bbwf.yml
@@ -8,11 +8,19 @@
 
 onosImage: 'onosproject/onos:1.13.4'
 
-xos_coreImage: 'xosproject/xos-core:2.1.0'
+# XOS core images
+images:
+  xos_core:
+    tag: 2.1.0
+
+# service images
 fabric:
-  fabric_synchronizerImage: 'xosproject/fabric-synchronizer:2.1.0'
+  images:
+    tag: 2.1.0
+
 att-workflow-driver:
-  attWorkflowDriver_synchronizerImage: 'xosproject/att-workflow-driver-synchronizer:1.0.0'
+  images:
+    tag: 1.0.0
 
 # application_logs: |
 #   log4j.logger.org.opencord.olt = DEBUG
diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index eae1a3a..7109170 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -16,31 +16,47 @@
 
 onosImage: '192.168.99.181:30500/onos/onos:ams-1.0.0'
 
+global:
+  registry: '192.168.99.181:30500/'
+
 # xos
-xos_coreImage: '192.168.99.181:30500/xosproject/xos-core:2.1.4'
-xos_chameleonImage: '192.168.99.181:30500/xosproject/chameleon:master'
-xos_toscaImage: '192.168.99.181:30500/xosproject/xos-tosca:master'
+images:
+  xos_core:
+    tag: 2.1.4
+  xos_chameleon:
+    tag: master
+  xos_tosca:
+    tag: master
+
 xos-gui:
-  xos_guiImage: '192.168.99.181:30500/xosproject/xos-gui:master'
-  xos_wsImage: '192.168.99.181:30500/xosproject/xos-ws:master'
-xos-db:
-  postgresImage: '192.168.99.181:30500/postgres:10.3-alpine'
+  images:
+    xos_gui:
+      tag: master
+    xos_ws:
+      tag: master
 
 # synchronizers
 rcord:
-  rcord_synchronizerImage: '192.168.99.181:30500/xosproject/rcord-synchronizer:1.0.3'
+  image:
+    tag: 1.0.3
 fabric:
-  fabric_synchronizerImage: '192.168.99.181:30500/xosproject/fabric-synchronizer:2.1.1'
+  image:
+    tag: 2.1.1
 volt:
-  volt_synchronizerImage: '192.168.99.181:30500/xosproject/volt-synchronizer:2.0.3'
+  image:
+    tag: 2.0.3
 fabric-crossconnect:
-  fabric_crossconnect_synchronizerImage: '192.168.99.181:30500/xosproject/fabric-crossconnect-synchronizer:1.0.2'
+  image:
+    tag: 1.0.2
 onos-service:
-  onos_synchronizerImage: '192.168.99.181:30500/xosproject/onos-synchronizer:2.0.4'
+  image:
+    tag: 2.0.4
 att-workflow-driver:
-  attWorkflowDriver_synchronizerImage: '192.168.99.181:30500/xosproject/att-workflow-driver-synchronizer:1.0.0'
+  image:
+    tag: 1.0.0
 kubernetes:
-  kubernetes_synchronizerImage: "192.168.99.181:30500/xosproject/kubernetes-synchronizer:1.0.2"
+  image:
+    tag: 1.0.2
 
 # kafka
 image: '192.168.99.181:30500/confluentinc/cp-kafka:4.1.2-2'
diff --git a/kubernetes-configs/flex-pod1-olt.yml b/kubernetes-configs/flex-pod1-olt.yml
index 98c1a1e..0f27e0b 100644
--- a/kubernetes-configs/flex-pod1-olt.yml
+++ b/kubernetes-configs/flex-pod1-olt.yml
@@ -28,11 +28,19 @@
 
 onosImage: 'onosproject/onos:1.13.4'
 
-xos_coreImage: 'xosproject/xos-core:2.1.0'
+# XOS core images
+images:
+  xos_core:
+    tag: 2.1.0
+
+# service images
 fabric:
-  fabric_synchronizerImage: 'xosproject/fabric-synchronizer:2.1.0'
+  images:
+    tag: 2.1.0
+
 att-workflow-driver:
-  attWorkflowDriver_synchronizerImage: 'xosproject/att-workflow-driver-synchronizer:1.0.0'
+  images:
+    tag: 1.0.0
 
 # application_logs: |
 #   log4j.logger.org.opencord.olt = DEBUG
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 5062830..ec87d7e 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -10,11 +10,6 @@
 
 # onosImage: '10.90.0.101:30500/onosproject/onos:candidate'
 
-#xos_coreImage: '10.90.0.101:30500/xosproject/xos-core:candidate'
-
-#xos-gui:
-#  xos_wsImage: '10.90.0.101:30500/xosproject/xos-ws:candidate'
-
 application_logs: |
    log4j.logger.org.opencord.olt = TRACE
    log4j.logger.org.opencord.kafka = DEBUG
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index 83b42ef..7044ce6 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -10,12 +10,15 @@
 
 onosImage: '10.90.0.101:30500/onosproject/onos:candidate'
 
-xos_coreImage: '10.90.0.120:30500/xosproject/xos-core:candidate'
+images:
+  xos_core:
+    repository: '10.90.0.120:30500/xosproject/xos-core'
+    tag: 'candidate'
 
 volt:
-  volt_synchronizerImage: "10.90.0.120:30500/xosproject/volt-synchronizer:candidate"
-#xos-gui:
-#  xos_wsImage: '10.90.0.120:30500/xosproject/xos-ws:candidate'
+  image:
+    repository: '10.90.0.120:30500/xosproject/volt-synchronizer'
+    tag: 'candidate'
 
 application_logs: |
    log4j.logger.org.opencord.olt = TRACE