diff --git a/kubernetes-configs/bbwf.yml b/kubernetes-configs/bbwf.yml
index 849c578..2051ec4 100644
--- a/kubernetes-configs/bbwf.yml
+++ b/kubernetes-configs/bbwf.yml
@@ -4,7 +4,15 @@
 netconfImage: '192.168.100.1:30500/voltha/voltha-netconf:berlin-1.0.2'
 ofagentImage: '192.168.100.1:30500/voltha/voltha-ofagent:berlin-1.0.2'
 vcliImage: '192.168.100.1:30500/voltha/voltha-cli:berlin-1.0.2'
-vcoreImage: '192.168.100.1:30500/voltha/voltha-voltha:berlin-1.0.2'
+vcoreImage: '192.168.100.1:30500/voltha/voltha-voltha:dev'
+# vcoreImage: '192.168.100.1:30500/voltha/voltha-voltha:berlin-1.0.2'
+freeradiusImage: '192.168.100.1:30500/tpdock/freeradius:latest'
+ingressControllerImage: '192.168.100.1:30500/quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2'
+httpBackendImage: '192.168.100.1:30500/google_containers/defaultbackend:1.4'
+
+etcd-operator:
+  etcdCluster:
+    size: 1
 
 onosImage: '192.168.100.1:30500/onosproject/onos:1.13.5'
 
@@ -29,44 +37,8 @@
       tag: 2.0.0
 xos-db:
   image:
-  repository: '192.168.100.1:30500/postgres'
-  tag: '10.3-alpine'
-
-# synchronizers
-att-workflow-driver:
-  image:
-    repository: 192.168.100.1:30500/xosproject/att-workflow-driver-synchronizer
-    tag: 'master'
-
-volt:
-  image:
-    repository: 192.168.100.1:30500/xosproject/volt-synchronizer
-    tag: 'candidate'
-
-rcord:
-  image:
-    repository: 192.168.100.1:30500/xosproject/rcord-synchronizer
-    tag: 1.0.4
-
-onos-service:
-  image:
-    repository: 192.168.100.1:30500/xosproject/onos-synchronizer
-    tag: 2.0.5
-
-fabric:
-  image:
-    repository: 192.168.100.1:30500/xosproject/fabric-synchronizer
-    tag: 2.1.3
-
-fabric-crossconnect:
-  image:
-    repository: 192.168.100.1:30500/xosproject/fabric-crossconnect-synchronizer
-    tag: 1.1.1
-
-kubernetes:
-  image:
-    repository: 192.168.100.1:30500/xosproject/kubernetes-synchronizer
-    tag: 1.0.4
+    repository: '192.168.100.1:30500/postgres'
+    tag: '10.3-alpine'
 
 tosca_loaderImage: '192.168.100.1:30500/xosproject/tosca-loader:1.0.1'
 
@@ -77,10 +49,14 @@
     tag: 'latest'
 
 # kafka
-image: '192.168.100.1:30500/confluentinc/cp-kafka:4.1.2-2'
+image: '192.168.100.1:30500/confluentinc/cp-kafka'
+configurationOverrides:
+  "confluent.support.metrics.enable": false
 
 zookeper:
-  image: '192.168.100.1:30500/google_samples/k8szk:v3'
+  image:
+    reposiroty: '192.168.100.1:30500/google_samples/k8szk'
+    tag: v3
 
 etcd-operator:
   etcdOperator:
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index f6a862d..22af206 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -15,11 +15,21 @@
 
 att-workflow-driver:
   image:
-    tag: 'master'
+    repository: 10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer
+    tag: candidate
 
-volt:
+rcord:
   image:
-    tag: 'master'
+    repository: 10.90.0.101:30500/xosproject/rcord-synchronizer
+    tag: candidate
+fabric:
+  image:
+    repository: 10.90.0.101:30500/xosproject/fabric-synchronizer
+    tag: candidate
+vsg-hw:
+  image:
+    repository: 10.90.0.101:30500/xosproject/vsg-hw-synchronizer
+    tag: candidate
 
 onosImage: 'onosproject/onos:1.13.5'
 
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index 4cab9a3..2c408c4 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -1,6 +1,6 @@
 # SEBA Values
 
-vcoreImage: '10.90.0.120:30500/voltha/voltha-voltha:latest'
+vcoreImage: '10.90.0.120:30500/voltha/voltha-voltha:dev'
 
 volt:
   image:
@@ -11,7 +11,7 @@
 
 image:
   repository: '10.90.0.120:30500/voltha/voltha-bbsim'
-  tag: 'stable'
+  tag: 'sleep'
 
 application_logs: |
    log4j.logger.org.opencord.olt = TRACE
diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index c044477..e77f4a1 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -173,7 +173,7 @@
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
         serial_number: ALPHe3d1cee9
-        pon_port_id: 536870912
+        pon_port_id: 536870913
         device_id: of:00000000c0a8646f
       requirements:
         - owner:
@@ -184,7 +184,7 @@
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
         serial_number: ISKT71e81130
-        pon_port_id: 536870912
+        pon_port_id: 536870913
         device_id: of:00000000c0a8646f
       requirements:
         - owner: