diff --git a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
index 0d19b29..deeeafb 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
@@ -102,7 +102,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -115,7 +115,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -128,7 +128,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
diff --git a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
index 9f20864..c1873c2 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.90.0.241'
+      ip: '10.35.90.20'
       user: 'cord'
       pass: 'cord'
 
@@ -42,8 +42,8 @@
   olts:
   # Gpon OLT
     -
-      ip:  10.90.0.245
-      sship:  10.90.0.245
+      ip:  10.35.90.21
+      sship:  10.35.90.21
       user: root
       pass: onl
       fortygig: True
@@ -69,7 +69,7 @@
         power_switch_port: 4
         uni_id: 1
       -
-        ip: 10.90.0.241
+        ip: 10.35.90.20
         user: cord
         pass: cord
         dp_iface_name: eth1.89
@@ -82,7 +82,7 @@
         power_switch_port: 2
         uni_id: 1
       -
-        ip: 10.90.0.241
+        ip: 10.35.90.20
         user: cord
         pass: cord
         dp_iface_name: eth1.90
@@ -95,7 +95,7 @@
         power_switch_port: 1
         uni_id: 1
       -
-        ip: 10.90.0.51
+        ip: 10.35.90.27
         user: ubuntu
         pass: null
         dp_iface_name: eth1.92
@@ -115,7 +115,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -128,7 +128,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -141,7 +141,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -154,7 +154,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
diff --git a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
index 4c60711..1273aed 100644
--- a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
@@ -56,7 +56,7 @@
     src:
       # 3200G ONU
       -
-        ip: 10.90.0.241
+        ip: 10.35.90.20
         user: cord
         pass: cord
         dp_iface_name: eth1.111
@@ -102,7 +102,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -115,7 +115,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -128,7 +128,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
diff --git a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
index 8cebf13..874cd0a 100644
--- a/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-gpon.yaml
@@ -29,7 +29,7 @@
       user: 'cord'
       pass: 'cord'
     -
-      ip: '10.90.0.241'
+      ip: '10.35.90.20'
       user: 'cord'
       pass: 'cord'
 
@@ -92,7 +92,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -105,7 +105,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index e815aec..896b2d1 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -24,11 +24,11 @@
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.71'
+    ip: '10.35.90.47'
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.72'
+    ip: '10.35.90.48'
     user: 'cord'
     pass: 'cord'
 
@@ -64,7 +64,7 @@
 hosts:
   src:
     -
-      ip: '10.128.100.72'
+      ip: '10.35.90.48'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1.11'
@@ -78,7 +78,7 @@
       onu_type: 'iskratel'
       uni_id: '1'
     -
-      ip: '10.128.100.71'
+      ip: '10.35.90.47'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1.22'
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 8e70e23..c797230 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -23,11 +23,11 @@
       user: 'cord'
       pass: 'cord'
     -
-      ip: '10.128.100.71'
+      ip: '10.35.90.47'
       user: 'cord'
       pass: 'cord'
     -
-      ip: '10.128.100.72'
+      ip: '10.35.90.48'
       user: 'cord'
       pass: 'cord'
 
@@ -58,7 +58,7 @@
     src:
       #GPON ONU
       -
-        ip: 10.90.0.51
+        ip: 10.35.90.27
         user: ubuntu
         pass: null
         dp_iface_name: eth1.7
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 77b043d..1a49885 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -24,11 +24,11 @@
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.71'
+    ip: '10.35.90.47'
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.72'
+    ip: '10.35.90.48'
     user: 'cord'
     pass: 'cord'
 
@@ -64,7 +64,7 @@
 hosts:
   src:
     -
-      ip: '10.128.100.72'
+      ip: '10.35.90.48'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1'
@@ -78,7 +78,7 @@
       onu_type: 'iskratel'
       uni_id: '1'
     -
-      ip: '10.128.100.71'
+      ip: '10.35.90.47'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1'
diff --git a/kubernetes-configs/onf-demo-pod-openonugo.conf b/kubernetes-configs/onf-demo-pod-openonugo.conf
index 313a97b..2d99306 100755
--- a/kubernetes-configs/onf-demo-pod-openonugo.conf
+++ b/kubernetes-configs/onf-demo-pod-openonugo.conf
@@ -4,30 +4,31 @@
 - name: "onf-demo-pod"
   cluster:
     server: "https://10.35.90.46:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml b/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
index ff462a1..94affc2 100755
--- a/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
@@ -34,7 +34,7 @@
       properties:
         name: ONF OLT
         device_type: openolt
-        host: 10.90.0.114
+        host: 10.35.90.28
         port: 9191
         switch_datapath_id: of:0000000000000001
         switch_port: "2"
diff --git a/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
index 8e0daf5..a4f4868 100755
--- a/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
@@ -34,7 +34,7 @@
       properties:
         name: ONF OLT
         device_type: openolt
-        host: 10.90.0.114
+        host: 10.35.90.28
         port: 9191
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
diff --git a/tosca-configs/att-workflow/onlab-pod1-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
index a36ba5d..8417304 100755
--- a/tosca-configs/att-workflow/onlab-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
@@ -35,7 +35,7 @@
       properties:
         name: ONF OLT
         device_type: openolt
-        host: 10.90.0.114
+        host: 10.35.90.28
         port: 9191
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
index 86f0004..d8fec1c 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
@@ -35,7 +35,7 @@
       properties:
         name: ONF OLT
         device_type: openolt
-        host: 10.90.0.114
+        host: 10.35.90.28
         port: 9191
         switch_datapath_id: of:0000000000000001
         switch_port: "1"
diff --git a/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml
index c0a33f9..6257dbf 100755
--- a/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml
@@ -34,7 +34,7 @@
       properties:
         name: ONF OLT
         device_type: openolt
-        host: 10.90.0.114
+        host: 10.35.90.28
         port: 9191
         switch_datapath_id: of:0000000000000001
         switch_port: "1"