diff --git a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
index fdeab14..18a6927 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.90.0.240'
+      ip: '10.35.90.18'
       user: 'cord'
       pass: 'cord'
 
@@ -33,7 +33,7 @@
   # The switch is shared across 3 PODs, thus is externally controlled
   #   -
   #     mac: '8c:ea:1b:a7:29:72'
-  #     ip: 10.90.0.243
+  #     ip: 10.35.90.17
   #     user: root
   #     pass: onl
   #     bngPort: 31
@@ -41,8 +41,8 @@
 
   olts:
     -
-      ip:  10.90.0.246
-      sship:  10.90.0.246
+      ip:  10.35.90.19
+      sship:  10.35.90.19
       user: root
       pass: onl
       fortygig: True
@@ -55,7 +55,7 @@
     src:
       # 1600G OLT
       -
-        ip: 10.90.0.240
+        ip: 10.35.90.18
         user: cord
         pass: cord
         dp_iface_name: eth1.222
@@ -65,10 +65,10 @@
         olt: 722033738988
         c_tag: 222
         s_tag: 22
-        power_switch_port: 4
+        power_switch_port: 6
         uni_id: 1
       -
-        ip: 10.90.0.240
+        ip: 10.35.90.18
         user: cord
         pass: cord
         dp_iface_name: eth1.333
@@ -78,7 +78,7 @@
         olt: 722033738988
         c_tag: 333
         s_tag: 33
-        power_switch_port: 8
+        power_switch_port: 5
         uni_id: 1
 
     dst:
@@ -89,7 +89,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
@@ -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
@@ -112,7 +112,7 @@
         container_name: null
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.35.90.25'
     user: 'cord'
     password: 'cord'
     type: 'DLI'
diff --git a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
index 699d73a..185ca12 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'
 
@@ -33,7 +33,7 @@
   # The switch is shared across 3 PODs, thus is externally controlled
   #   -
   #     mac: '8c:ea:1b:a7:29:72'
-  #     ip: 10.90.0.243
+  #     ip: 10.35.90.17
   #     user: root
   #     pass: onl
   #     bngPort: 31
@@ -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
@@ -56,7 +56,7 @@
     src:
       # 1600X OLT
       -
-        ip: 10.90.0.240
+        ip: 10.35.90.18
         user: cord
         pass: cord
         dp_iface_name: eth1.88
@@ -66,7 +66,7 @@
         olt: 722033038194
         c_tag: 88
         s_tag: 89
-        power_switch_port: 7
+        power_switch_port: 4
         uni_id: 1
 
     dst:
@@ -76,7 +76,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
@@ -86,7 +86,7 @@
         container_name: null
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.35.90.25'
     user: 'cord'
     password: 'cord'
     type: 'DLI'
diff --git a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
index e14b1e3..5cc7615 100644
--- a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.90.0.242'
+      ip: '10.35.90.23'
       user: 'cord'
       pass: 'cord'
 
@@ -33,7 +33,7 @@
   # The switch is shared across 3 PODs, thus is externally controlled
   #   -
   #     mac: '8c:ea:1b:a7:29:72'
-  #     ip: 10.90.0.243
+  #     ip: 10.35.90.17
   #     user: root
   #     pass: onl
   #     bngPort: 31
@@ -42,8 +42,8 @@
   olts:
   # Gpon OLT
     -
-      ip:  10.90.0.244
-      sship:  10.90.0.244
+      ip:  10.35.90.24
+      sship:  10.35.90.24
       user: root
       pass: onl
       fortygig: True
@@ -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
@@ -69,31 +69,31 @@
         power_switch_port: 2
         uni_id: 1
 
-      - ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.41
-        container_type: LXC
-        container_name: SCOMa0108af9
-        onu: SCOMa0108af9
-        olt: 722033538840
-        c_tag: 41
-        s_tag: 54
-        power_switch_port: 6
-        uni_id: 1
+#      - ip: 10.35.90.18
+#        user: cord
+#        pass: cord
+#        dp_iface_name: eth1.42
+#        container_type: LXC
+#        container_name: SCOMa0108af9
+#        onu: SCOMa0108af9
+#        olt: 722033538840
+#        c_tag: 42
+#        s_tag: 54
+#        power_switch_port: 6
+#        uni_id: 1
 
-      - ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.42
-        container_type: LXC
-        container_name: SCOMa0108aea
-        onu: SCOMa0108aea
-        olt: 722033538840
-        c_tag: 42
-        s_tag: 55
-        power_switch_port: 5
-        uni_id: 1
+#      - ip: 10.35.90.18
+#        user: cord
+#        pass: cord
+#        dp_iface_name: eth1.41
+#        container_type: LXC
+#        container_name: SCOMa0108aea
+#        onu: SCOMa0108aea
+#        olt: 722033538840
+#        c_tag: 41
+#        s_tag: 55
+#        power_switch_port: 5
+#        uni_id: 1
 
     dst:
       # 3200G OLT
@@ -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
@@ -111,34 +111,34 @@
         container_type: null
         container_name: null
 
-      - dp_iface_ip_qinq: 10.54.41.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
+#      - dp_iface_ip_qinq: 10.54.42.254
+#        ip: null
+#        user: null
+#        pass: null
+#        noroot_ip: 10.35.90.20
+#        noroot_user: cord
+#        noroot_pass: cord
+#        dp_iface_name: enp3s0d1
+#        dp_iface_ip: null
+#        dp_iface_gateway: null
+#        container_type: null
+#        container_name: null
 
-      - dp_iface_ip_qinq: 10.55.42.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
+#      - dp_iface_ip_qinq: 10.55.41.254
+#        ip: null
+#        user: null
+#        pass: null
+#        noroot_ip: 10.35.90.20
+#        noroot_user: cord
+#        noroot_pass: cord
+#        dp_iface_name: enp3s0d1
+#        dp_iface_ip: null
+#        dp_iface_gateway: null
+#        container_type: null
+#        container_name: null
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.35.90.22'
     user: 'cord'
     password: 'cord'
     type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 9023c15..cc3ba92 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -20,22 +20,22 @@
 
 nodes:
   -
-    ip: '10.128.100.70'
+    ip: '10.35.90.46'
     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'
 
 fabric_switches:
   -
     mac: 'cc:37:ab:61:80:ca'
-    ip: '10.128.100.80'
+    ip: '10.35.90.44'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -44,8 +44,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '10.128.99.90'
-    sship: '10.128.99.90'
+    ip: '10.35.90.45'
+    sship: '10.35.90.45'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -53,31 +53,32 @@
     serial: 'EC1721000216'
     oltDebVersion: openolt_asfvolt16-3.4.9-e2a9597f3d690fe3a0ea0df244571dfc9e8c2833-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 2
 
 onus:
-  -
-    serial: 'ISKT71e80080'
+#  -
+#    serial: 'ISKT71e80080'
   -
     serial: 'ALPHe3d1cf9d'
 
 hosts:
   src:
+#    -
+#      ip: '10.35.90.48'
+#      user: 'cord'
+#      pass: 'cord'
+#      dp_iface_name: 'eth1.11'
+#      container_type: LXC
+#      container_name: ISKT71e80080
+#      onu: 'ISKT71e80080'
+#      olt: 'EC1721000216'
+#      c_tag: '11'
+#      s_tag: '11'
+#      power_switch_port: 6
+#      onu_type: 'iskratel'
+#      uni_id: '1'
     -
-      ip: '10.128.100.72'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.11'
-      container_type: LXC
-      container_name: ISKT71e80080
-      onu: 'ISKT71e80080'
-      olt: 'EC1721000216'
-      c_tag: '11'
-      s_tag: '11'
-      power_switch_port: 6
-      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'
@@ -91,27 +92,27 @@
       onu_type: 'alpha'
       uni_id: '1'
   dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.11.254'
-      noroot_ip: 10.128.100.70
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f0
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
+#    -
+#      ip: null
+#      user: null
+#      pass: null
+#      dp_iface_name: null
+#      dp_iface_ip_qinq: '10.11.11.254'
+#      noroot_ip: 10.35.90.46
+#      noroot_user: cord
+#      noroot_pass: cord
+#      dp_iface_name: ens6f0
+#      dp_iface_ip: null
+#      dp_iface_gateway: null
+#      container_type: null
+#      container_name: null
     -
       ip: null
       user: null
       pass: null
       dp_iface_name: null
       dp_iface_ip_qinq: '10.22.22.254'
-      noroot_ip: '10.128.100.70'
+      noroot_ip: '10.35.90.46'
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens6f0
@@ -121,7 +122,7 @@
       container_name: null
 
 web_power_switch:
-  ip: '10.128.100.75'
+  ip: '10.35.90.49'
   user: 'cord'
   password: 'cord'
   type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 7a33cbe..1b40ef4 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -19,22 +19,22 @@
   # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.128.100.70'
+      ip: '10.35.90.46'
       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'
 
   fabric_switches:
     -
       mac: 'cc:37:ab:61:80:ca'
-      ip: '10.128.100.80'
+      ip: '10.35.90.44'
       user: 'root'
       pass: 'onl'
       bngPort: '31'
@@ -52,14 +52,15 @@
       serial: EC1912001818
       oltDebVersion: openolt_asgvolt64-3.4.9-e2a9597f3d690fe3a0ea0df244571dfc9e8c2833-40G-NNI.deb
       board_technology: GPON
+      power_switch_port: 3
 
   hosts:
     src:
       #GPON ONU
       -
-        ip: 10.90.0.51
-        user: ubuntu
-        pass: null
+        ip: 10.35.90.27
+        user: cord
+        pass: cord
         dp_iface_name: eth1.7
         container_type: LXC
         container_name: SCOM00001ca7
@@ -75,7 +76,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: '10.128.100.70'
+        noroot_ip: '10.35.90.46'
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: ens6f0
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 25cd442..24c981f 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -20,22 +20,22 @@
 
 nodes:
   -
-    ip: '10.128.100.70'
+    ip: '10.35.90.46'
     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'
 
 fabric_switches:
   -
     mac: 'cc:37:ab:61:80:ca'
-    ip: '10.128.100.80'
+    ip: '10.35.90.44'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -44,8 +44,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '10.128.99.90'
-    sship: '10.128.99.90'
+    ip: '10.35.90.45'
+    sship: '10.35.90.45'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -53,31 +53,32 @@
     serial: 'EC1721000216'
     oltDebVersion: openolt_asfvolt16-3.4.9-e2a9597f3d690fe3a0ea0df244571dfc9e8c2833-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 2
 
 onus:
-  -
-    serial: 'ISKT71e80080'
+#  -
+#    serial: 'ISKT71e80080'
   -
     serial: 'ALPHe3d1cf9d'
 
 hosts:
   src:
+#    -
+#      ip: '10.35.90.48'
+#      user: 'cord'
+#      pass: 'cord'
+#      dp_iface_name: 'eth1'
+#      container_type: LXC
+#      container_name: ISKT71e80080
+#      onu: 'ISKT71e80080'
+#      olt: 'EC1721000216'
+#      c_tag: '11'
+#      s_tag: '99'
+#      power_switch_port: 6
+#      onu_type: 'iskratel'
+#      uni_id: '1'
     -
-      ip: '10.128.100.72'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1'
-      container_type: LXC
-      container_name: ISKT71e80080
-      onu: 'ISKT71e80080'
-      olt: 'EC1721000216'
-      c_tag: '11'
-      s_tag: '99'
-      power_switch_port: 6
-      onu_type: 'iskratel'
-      uni_id: '1'
-    -
-      ip: '10.128.100.71'
+      ip: '10.35.90.47'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1'
@@ -91,24 +92,24 @@
       onu_type: 'alpha'
       uni_id: '1'
   dst:
+#    -
+#      ip: null
+#      user: null
+#      pass: null
+#      noroot_ip: '10.35.90.46'
+#      noroot_user: cord
+#      noroot_pass: cord
+#      dp_iface_name: ens6f0
+#      dp_iface_ip_qinq: '10.99.11.254'
+#      dp_iface_ip: null
+#      dp_iface_gateway: null
+#      container_type: null
+#      container_name: null
     -
       ip: null
       user: null
       pass: null
-      noroot_ip: '10.128.100.70'
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f0
-      dp_iface_ip_qinq: '10.99.11.254'
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
-    -
-      ip: null
-      user: null
-      pass: null
-      noroot_ip: '10.128.100.70'
+      noroot_ip: '10.35.90.46'
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens6f0
@@ -119,7 +120,7 @@
       container_name: null
 
 web_power_switch:
-  ip: '10.128.100.75'
+  ip: '10.35.90.49'
   user: 'cord'
   password: 'cord'
   type: 'DLI'
diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index 03d6969..fde241f 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -40,8 +40,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -60,7 +60,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0.11'
@@ -73,7 +73,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1.12'
@@ -90,7 +90,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f0
@@ -103,7 +103,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f0
diff --git a/deployment-configs/onf-soak-pod-openonugo.yaml b/deployment-configs/onf-soak-pod-openonugo.yaml
index 02b12d3..d6d6c71 100644
--- a/deployment-configs/onf-soak-pod-openonugo.yaml
+++ b/deployment-configs/onf-soak-pod-openonugo.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -35,8 +35,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -54,7 +54,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0'
@@ -67,7 +67,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1'
@@ -84,7 +84,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
@@ -97,7 +97,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index 02b12d3..d6d6c71 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -35,8 +35,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -54,7 +54,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0'
@@ -67,7 +67,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1'
@@ -84,7 +84,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
@@ -97,7 +97,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
diff --git a/deployment-configs/tucson-pod.yaml b/deployment-configs/tucson-pod.yaml
index 7122512..e24c5a3 100644
--- a/deployment-configs/tucson-pod.yaml
+++ b/deployment-configs/tucson-pod.yaml
@@ -26,7 +26,7 @@
 # Since we're running kind-voltha, the nodes are reached on localhost.
 nodes:
   -
-    ip: 127.0.0.1
+    ip: 10.35.90.27
     user: 'cord'
     pass: 'cord'
 
@@ -35,8 +35,8 @@
 
 olts:
   -
-    ip: 192.168.2.22
-    sship: 192.168.2.22
+    ip: 10.35.90.28
+    sship: 10.35.90.28
     user: root
     pass: onl
     fortygig: True
@@ -56,7 +56,7 @@
       c_tag: 11
       s_tag: 11
       onu_type: 'alpha'
-      power_switch_port: 2
+#      power_switch_port: 2
       uni_id: 1
     -
       ip: 127.0.0.1
@@ -70,7 +70,7 @@
       c_tag: 12
       s_tag: 11
       onu_type: 'iskratel'
-      power_switch_port: 3
+#      power_switch_port: 3
       uni_id: 1
     -
       ip: 127.0.0.1
@@ -84,7 +84,7 @@
       c_tag: 21
       s_tag: 21
       onu_type: 'alpha'
-      power_switch_port: 4
+#      power_switch_port: 4
       uni_id: 1
 
   dst: