diff --git a/kubernetes-configs/bbsim-voltha-master.yml b/kubernetes-configs/bbsim-voltha-master.yml
new file mode 100644
index 0000000..ebbc254
--- /dev/null
+++ b/kubernetes-configs/bbsim-voltha-master.yml
@@ -0,0 +1,43 @@
+---
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for installing latest/master of bbsim+voltha1.6 (currently not supported with voltha-master)
+
+# This file is used to optionally customize helm charts installations
+
+images:
+  netconf:
+    repository: 'voltha/voltha-netconf'
+    tag: 'voltha-1.6'
+
+  ofagent:
+    repository: 'voltha/voltha-ofagent'
+    tag: 'voltha-1.6'
+
+  vcli:
+    repository: 'voltha/voltha-cli'
+    tag: 'voltha-1.6'
+
+  vcore:
+    repository: 'voltha/voltha-voltha'
+    tag: 'voltha-1.6'
+
+  envoy_for_etcd:
+    repository: 'voltha/voltha-envoy'
+    tag: 'voltha-1.6'
+
+  alarm_generator:
+    repository: 'voltha/voltha-alarm-generator'
+    tag: 'voltha-1.6'
diff --git a/kubernetes-configs/flex-pod1-olt-voltha-master.yml b/kubernetes-configs/flex-pod1-olt-voltha-master.yml
index f7f2359..02ce5ae 100644
--- a/kubernetes-configs/flex-pod1-olt-voltha-master.yml
+++ b/kubernetes-configs/flex-pod1-olt-voltha-master.yml
@@ -31,3 +31,15 @@
 
   vcore:
     tag: 'latest'
+# ONOS applications
+aaaAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/aaa/1.8.0-SNAPSHOT/aaa-1.8.0-20181129.184849-116.oar"
+aaaAppVersion: "1.8.0.SNAPSHOT"
+
+sadisAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/sadis-app/2.2.0-SNAPSHOT/sadis-app-2.2.0-20181127.081727-156.oar"
+sadisAppVersion: "2.2.0.SNAPSHOT"
+
+dhcpl2relayAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/dhcpl2relay/1.5.0-SNAPSHOT/dhcpl2relay-1.5.0-20181129.184928-160.oar"
+dhcpl2relayAppVersion: "1.5.0.SNAPSHOT"
+
+oltAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/olt-app/2.1.0-SNAPSHOT/olt-app-2.1.0-20181129.184957-41.oar"
+oltAppVersion: "2.1.0.SNAPSHOT"
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 6e77848..4105d5f 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -27,6 +27,62 @@
 #       repository: smbaker/volt-synchronizer
 #       tag: test-syncstep
 
+# in xos-core
+images:
+  xos_core:
+    repository: '10.90.0.101:30500/xosproject/xos-core'
+    tag: '8035085'
+  xos_chameleon:
+    repository: '10.90.0.101:30500/xosproject/chameleon'
+    tag: '8035085'
+  xos_tosca:
+    repository: '10.90.0.101:30500/xosproject/xos-tosca'
+    tag: '8035085'
+  xos_api_tester:
+    repository: '10.90.0.101:30500/xosproject/xos-api-tester'
+    tag: '8035085'
+  tosca_loader:
+    repository: '10.90.0.101:30500/xosproject/tosca-loader'
+    tag: '8035085'
+
+# in xos-profiles/base-kubernetes
+kubernetes:
+  image:
+    repository: '10.90.0.101:30500/xosproject/kubernetes-synchronizer'
+    tag: '8035085'
+
+# in xos-profiles/seba-services
+rcord:
+  image:
+    repository: '10.90.0.101:30500/xosproject/rcord-synchronizer'
+    tag: '8035085'
+onos-service:
+  image:
+    repository: '10.90.0.101:30500/xosproject/onos-synchronizer'
+    tag: '8035085'
+fabric:
+  image:
+    repository: '10.90.0.101:30500/xosproject/fabric-synchronizer'
+    tag: '8035085'
+volt:
+  image:
+    repository: '10.90.0.101:30500/xosproject/volt-synchronizer'
+    tag: '8035085'
+fabric-crossconnect:
+  image:
+    repository: '10.90.0.101:30500/xosproject/fabric-crossconnect-synchronizer'
+    tag: '8035085'
+# sadis-server:
+#   image:
+#     tag: '8035085'
+
+# in workflows/att-workflow
+att-workflow-driver:
+  image:
+    repository: '10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer'
+    tag: '8035085'
+
+# ONOS config
 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 f11ea76..2b70006 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -31,34 +31,62 @@
 #    tag: candidate
 
 
-# in seba service chart
-fabric:
+# in xos-core
+images:
+  xos_core:
+    repository: '10.90.0.120:30500/xosproject/xos-core'
+    tag: '8035085'
+  xos_chameleon:
+    repository: '10.90.0.120:30500/xosproject/chameleon'
+    tag: '8035085'
+  xos_tosca:
+    repository: '10.90.0.120:30500/xosproject/xos-tosca'
+    tag: '8035085'
+  xos_api_tester:
+    repository: '10.90.0.120:30500/xosproject/xos-api-tester'
+    tag: '8035085'
+  tosca_loader:
+    repository: '10.90.0.120:30500/xosproject/tosca-loader'
+    tag: '8035085'
+
+# in xos-profiles/base-kubernetes
+kubernetes:
   image:
-    repository: 'smbaker/fabric-synchronizer'
-    tag: 'test'
-fabric-crossconnect:
-  image:
-    repository: 'smbaker/fabric-crossconnect-synchronizer'
-    tag: 'test'
-onos-service:
-  image:
-    repository: 'smbaker/onos-synchronizer'
-    tag: 'test'
-volt:
-  image:
-    repository: 'smbaker/volt-synchronizer'
-    tag: 'test'
+    repository: '10.90.0.120:30500/xosproject/kubernetes-synchronizer'
+    tag: '8035085'
+
+# in xos-profiles/seba-services
 rcord:
   image:
-    repository: 'smbaker/rcord-synchronizer'
-    tag: 'test'
+    repository: '10.90.0.120:30500/xosproject/rcord-synchronizer'
+    tag: '8035085'
+onos-service:
+  image:
+    repository: '10.90.0.120:30500/xosproject/onos-synchronizer'
+    tag: '8035085'
+fabric:
+  image:
+    repository: '10.90.0.120:30500/xosproject/fabric-synchronizer'
+    tag: '8035085'
+volt:
+  image:
+    repository: '10.90.0.120:30500/xosproject/volt-synchronizer'
+    tag: '8035085'
+fabric-crossconnect:
+  image:
+    repository: '10.90.0.120:30500/xosproject/fabric-crossconnect-synchronizer'
+    tag: '8035085'
+# sadis-server:
+#   image:
+#     tag: '8035085'
 
-# in workflow/att-workflow service chart
+# in workflows/att-workflow
 att-workflow-driver:
   image:
-    repository: 'smbaker/att-workflow-driver-synchronizer'
-    tag: 'test'
+    repository: '10.90.0.120:30500/xosproject/att-workflow-driver-synchronizer'
+    tag: '8035085'
 
+# ONOS config
 application_logs: |
    log4j.logger.org.opencord.olt = TRACE
    log4j.logger.org.opencord.kafka = DEBUG