diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
index 24f6f3b..38b19ce 100644
--- a/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-mwc-b7.yaml
@@ -17,13 +17,13 @@
     s1u:
       device: "s1u-net"
       # NOTE: set different IP for each edge
-      ip: "119.0.0.4/24"
+      ip: "192.168.251.4/24"
     sgi:
       device: "sgi-net"
       # NOTE: set different IP for each edge
-      ip: "13.1.1.4/24"
+      ip: "192.168.250.4/24"
     dpName: "dp1"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
-    gateway: "13.1.1.250"
+    gateway: "192.168.250.250"
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
index febe7c0..d2cb5bb 100644
--- a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
@@ -17,13 +17,13 @@
     s1u:
       device: "s1u-net"
       # NOTE: set different IP for each edge
-      ip: "119.0.0.3/24"
+      ip: "192.168.251.3/24"
     sgi:
       device: "sgi-net"
       # NOTE: set different IP for each edge
-      ip: "13.1.1.3/24"
+      ip: "192.168.250.3/24"
     dpName: "dp2"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
-    gateway: "13.1.1.250"
+    gateway: "192.168.250.250"
diff --git a/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
index 5e90e65..f96eb6b 100644
--- a/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
@@ -11,13 +11,13 @@
     s1u:
       device: "s1u-net"
       # NOTE: set different IP for each edge
-      ip: "119.0.0.7/24"
+      ip: "192.168.251.7/24"
     sgi:
       device: "sgi-net"
       # NOTE: set different IP for each edge
-      ip: "13.1.1.7/24"
+      ip: "192.168.250.7/24"
     dpName: "dp1"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
-    gateway: "13.1.1.30"
+    gateway: "192.168.250.30"
diff --git a/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
index 14a96af..7b0296d 100644
--- a/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
@@ -10,11 +10,11 @@
       addr: "spgwc-headless.omec.svc.staging.central"
     s1u:
       device: "s1u-net"
-      ip: "119.0.0.43/24"
+      ip: "192.168.251.43/24"
     sgi:
       device: "sgi-net"
-      ip: "13.1.1.43/24"
+      ip: "192.168.250.43/24"
     dpName: "dp-nokia"
 networks:
   sgi:
-    gateway: "13.1.1.42"
+    gateway: "192.168.250.42"
diff --git a/deployment-configs/comac-onf-testbed-helm-charts.yaml b/deployment-configs/comac-onf-testbed-helm-charts.yaml
index e3de945..81b6ac3 100644
--- a/deployment-configs/comac-onf-testbed-helm-charts.yaml
+++ b/deployment-configs/comac-onf-testbed-helm-charts.yaml
@@ -106,7 +106,7 @@
 
 networks:
   sgi:
-    gateway: 13.1.1.250 # Vyatta router IP
+    gateway: 192.168.250.250 # Vyatta router IP
 
 # cord-platform values
 etcd-operator:
diff --git a/tosca-configs/comac/edge-fabric-accelleran.yaml b/tosca-configs/comac/edge-fabric-accelleran.yaml
index 23ba0d9..113c51b 100644
--- a/tosca-configs/comac/edge-fabric-accelleran.yaml
+++ b/tosca-configs/comac/edge-fabric-accelleran.yaml
@@ -45,14 +45,14 @@
       type: tosca.nodes.Node
       properties:
         dataPlaneIntf: eth2
-        dataPlaneIp: 119.0.0.131
+        dataPlaneIp: 192.168.251.131
         name: node1
 
     node#node2:
       type: tosca.nodes.Node
       properties:
         dataPlaneIntf: eth2
-        dataPlaneIp: 119.0.0.132
+        dataPlaneIp: 192.168.251.132
         name: node2
 
     # static routes
@@ -106,7 +106,7 @@
     ip#port_1_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: node_1_sgi_net
       requirements:
         - interface:
@@ -116,23 +116,13 @@
     ip#port_1_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: node_1_s1u_net
       requirements:
         - interface:
             node: interface#port_1_interface
             relationship: tosca.relationships.BelongsToOne
 
-    ip#port_1_rru_net:
-      type: tosca.nodes.FabricIpAddress
-      properties:
-        ip: 116.0.0.254/24
-        description: node_1_rru_net
-      requirements:
-        - interface:
-            node: interface#port_1_interface
-            relationship: tosca.relationships.BelongsToOne
-
     # staging-edge-b
     port#node_2_port:
       type: tosca.nodes.SwitchPort
@@ -156,7 +146,7 @@
     ip#port_2_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: node_2_sgi_net
       requirements:
         - interface:
@@ -166,23 +156,13 @@
     ip#port_2_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: node_2_s1u_net
       requirements:
         - interface:
             node: interface#port_2_interface
             relationship: tosca.relationships.BelongsToOne
 
-    ip#port_2_rru_net:
-      type: tosca.nodes.FabricIpAddress
-      properties:
-        ip: 116.0.0.254/24
-        description: node_2_rru_net
-      requirements:
-        - interface:
-            node: interface#port_2_interface
-            relationship: tosca.relationships.BelongsToOne
-
     # staging-edge-c
     port#node_3_port:
       type: tosca.nodes.SwitchPort
@@ -206,7 +186,7 @@
     ip#port_3_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: node_3_sgi_net
       requirements:
         - interface:
@@ -216,7 +196,7 @@
     ip#port_3_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: node_3_s1u_net
       requirements:
         - interface:
@@ -246,7 +226,7 @@
     ip#port_4_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: node_4_sgi_net
       requirements:
         - interface:
@@ -256,7 +236,7 @@
     ip#port_4_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: node_4_s1u_net
       requirements:
         - interface:
@@ -286,7 +266,7 @@
     ip#port_5_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: node_5_sgi_net
       requirements:
         - interface:
@@ -296,7 +276,7 @@
     ip#port_5_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: node_5_s1u_net
       requirements:
         - interface:
@@ -326,7 +306,7 @@
     ip#port_6_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: node_6_sgi_net
       requirements:
         - interface:
@@ -336,7 +316,7 @@
     ip#port_6_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: node_6_s1u_net
       requirements:
         - interface:
@@ -366,7 +346,7 @@
     ip#port_rru_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: rru_sgi_net
       requirements:
         - interface:
@@ -376,23 +356,13 @@
     ip#port_rru_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: rru_s1u_net
       requirements:
         - interface:
             node: interface#rru_interface
             relationship: tosca.relationships.BelongsToOne
 
-    ip#port_rru_net:
-      type: tosca.nodes.FabricIpAddress
-      properties:
-        ip: 116.0.0.254/24
-        description: rru_net
-      requirements:
-        - interface:
-            node: interface#rru_interface
-            relationship: tosca.relationships.BelongsToOne
-
     # Management node Port
     port#man_node_port:
       type: tosca.nodes.SwitchPort
@@ -416,7 +386,7 @@
     ip#port_man_node_sgi_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 13.1.1.254/24
+        ip: 192.168.250.254/24
         description: man_node_sgi_net
       requirements:
         - interface:
@@ -426,7 +396,7 @@
     ip#port_man_node_s1u_net:
       type: tosca.nodes.FabricIpAddress
       properties:
-        ip: 119.0.0.254/24
+        ip: 192.168.251.254/24
         description: man_node_s1u_net
       requirements:
         - interface: