diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index 4144e44..37fd13d 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -3,32 +3,26 @@
 
 images:
   vcore:
-    repository: '10.90.0.120:30500/voltha/voltha-voltha'
-    tag: 'dev'
+    tag: 'voltha-1.6'
 
   vcli:
-    repository: '10.90.0.120:30500/voltha/voltha-cli'
-    tag: 'dev'
+    tag: 'voltha-1.6'
     pullPolicy: 'Always'
 
   ofagent:
-    repository: '10.90.0.120:30500/voltha/voltha-ofagent'
-    tag: 'dev'
+    tag: 'voltha-1.6'
     pullPolicy: 'Always'
 
   netconf:
-    repository: '10.90.0.120:30500/voltha/voltha-netconf'
-    tag: 'dev'
+    tag: 'voltha-1.6'
     pullPolicy: 'Always'
 
   envoy_for_etcd:
-    repository: '10.90.0.120:30500/voltha/voltha-envoy'
-    tag: 'dev'
+    tag: 'voltha-1.6'
     pullPolicy: 'Always'
 
   alarm_generator:
-    repository: '10.90.0.120:30500/voltha/voltha-alarm-generator'
-    tag: 'dev'
+    tag: 'voltha-1.6'
     pullPolicy: 'Always'
 
 application_logs: |
diff --git a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
index dc23a42..5ff15fa 100755
--- a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
@@ -126,7 +126,7 @@
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
         serial_number: ALPHe3d1cf8e
-        pon_port_id: 536870927
+        pon_port_id: 536870912
         device_id: of:000000000a5a007a
       requirements:
         - owner:
@@ -137,7 +137,7 @@
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
         serial_number: ALPHe3d1cf9d
-        pon_port_id: 536870927
+        pon_port_id: 536870912
         device_id: of:000000000a5a007a
       requirements:
         - owner:
@@ -148,7 +148,7 @@
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
         serial_number: ALPHe3d1ced5
-        pon_port_id: 536870927
+        pon_port_id: 536870912
         device_id: of:000000000a5a007a
       requirements:
         - owner:
@@ -159,7 +159,7 @@
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
         serial_number: ALPHe3d1cf70
-        pon_port_id: 536870927
+        pon_port_id: 536870912
         device_id: of:000000000a5a007a
       requirements:
         - owner: