diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index c11e0c6..9d12a82 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -13,77 +13,98 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
-
 # This file is used to optionally customize helm charts installations
+# voltha
+# etcd-cluster:
+#   clusterSize: 1
+
+# in xos-core chart and other charts with multiple images
 images:
-# VOLTHA
-  envoy_for_etcd:
-    repository: smbaker/voltha-envoy
-    tag: 'test'
-
-  netconf:
-    repository: smbaker/voltha-netconf
-    tag: 'test'
-
-  ofagent:
-    repository: smbaker/voltha-ofagent
-    tag: 'test'
-
-  vcli:
-    repository: smbaker/voltha-cli
-    tag: 'test'
-
-  vcore:
-    repository: smbaker/voltha-voltha
-    tag: 'test'
-
+  xos_core:
+    tag: 'master'
+  xos_chameleon:
+    tag: 'master'
+  xos_tosca:
+    tag: 'master'
+  xos_api_tester:
+    tag: 'master'
+  tosca_loader:
+    tag: 'master'
 # ONOS
   onos:
-    repository: 'matteoscandolo/onos'
-    tag: '1.13.9-rc3'
+    tag: '1.13.9-rc4'
+# VOLTHA
+  vcore:
+    tag: 'latest'
+  vcli:
+    tag: 'latest'
+  ofagent:
+    tag: 'latest'
+  netconf:
+    tag: 'latest'
+  envoy_for_etcd:
+    tag: 'latest'
+  alarm_generator:
+    tag: 'latest'
+  freeradius:
+    tag: 'latest'
+# BBSim
+  bbsim:
+    tag: 'latest'
 
+# in xos-gui sub-chart required by xos-core chart
+xos-gui:
+  images:
+    xos_gui:
+      tag: 'master'
+    xos_ws:
+      tag: 'master'
 
-  xos_core:
-    repository: smbaker/xos-core
-    tag: 'test'
-
+# in seba service chart
+fabric:
+  image:
+    tag: 'master'
+fabric-crossconnect:
+  image:
+    tag: 'master'
+onos-service:
+  image:
+    tag: 'master'
+sadis-server:
+  image:
+    tag: 'latest'
+volt:
+  image:
+    # repository: "10.128.22.1:30500/xosproject/volt-synchronizer"
+    # tag: 'candidate'
+    tag: 'master'
 rcord:
   image:
+    #repository: "10.128.22.1:30500/xosproject/rcord-synchronizer"
+    #tag: 'candidate'
+    tag: 'master'
+
+# in base-kubernetes chart
+kubernetes:
+  image:
     tag: 'master'
 
+# in workflow/att-workflow service chart
 att-workflow-driver:
   image:
     tag: 'master'
 
-sadis-server:
-  image:
-    repository: opencord/sadis-server
-    tag: latest
-
-#sadis-server:
-#  image:
-#    repository: 10.90.0.101:30500/opencord/sadis-server
-#    tag: candidate
-
-#rcord:
-#  image:
-#    repository: 10.90.0.101:30500/xosproject/rcord-synchronizer
-#    tag: candidate
-
-#att-workflow-driver:
-#  image:
-#    repository: 10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer
-#    tag: candidate
+  # this is mandatory, it's needed to correctly configure the kafka endpoint
+  kafkaService: cord-kafka
 
 # ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa&v=1.9.0-SNAPSHOT&e=oar"
+aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
 aaaAppVersion: "1.9.0.SNAPSHOT"
 
 sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
 sadisAppVersion: "3.1.0.SNAPSHOT"
 
-dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay&v=1.6.0-SNAPSHOT&e=oar"
+dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay-app&v=1.6.0-SNAPSHOT&e=oar"
 dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
 
 oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=3.0.1-SNAPSHOT&e=oar"