diff --git a/p4-pod-configs/dev-pod/cavium-spine2.json b/p4-pod-configs/dev-pod/cavium-spine1.json
similarity index 73%
rename from p4-pod-configs/dev-pod/cavium-spine2.json
rename to p4-pod-configs/dev-pod/cavium-spine1.json
index 907a1b9..0749d84 100644
--- a/p4-pod-configs/dev-pod/cavium-spine2.json
+++ b/p4-pod-configs/dev-pod/cavium-spine1.json
@@ -1,10 +1,11 @@
 {
   "devices": {
-    "device:cavium:spine2": {
+    "device:cavium:spine1": {
+      "chassisId": "000000000226",
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.92.0.194",
-          "deviceKeyId": "p4runtime:device:cavium:spine2",
+          "ip": "10.128.13.101",
+          "deviceKeyId": "p4runtime:device:cavium:spine1",
           "port": 50051,
           "deviceId": 1
         }
@@ -14,7 +15,7 @@
       },
       "ports": {
         "9": {
-          "name": "s227-eth1",
+          "name": "9",
           "speed": 100000,
           "enabled": true,
           "number": 9,
@@ -22,7 +23,7 @@
           "type": "copper"
         },
         "10": {
-          "name": "s227-eth2",
+          "name": "10",
           "speed": 100000,
           "enabled": true,
           "number": 10,
@@ -32,7 +33,7 @@
       },
       "basic": {
         "driver": "cavium-pro",
-        "name": "spine2"
+        "name": "spine1"
       }
     }
   }
diff --git a/p4-pod-configs/dev-pod/mellanox-spine1.json b/p4-pod-configs/dev-pod/mellanox-spine2.json
similarity index 74%
rename from p4-pod-configs/dev-pod/mellanox-spine1.json
rename to p4-pod-configs/dev-pod/mellanox-spine2.json
index 6c07b4d..c96f1fd 100644
--- a/p4-pod-configs/dev-pod/mellanox-spine1.json
+++ b/p4-pod-configs/dev-pod/mellanox-spine2.json
@@ -1,16 +1,16 @@
 {
   "devices": {
-    "device:mellanox:spine1": {
+    "device:mellanox:spine2": {
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.92.0.61",
-          "deviceKeyId": "p4runtime:device:mellanox:spine1",
+          "ip": "10.128.13.103",
+          "deviceKeyId": "p4runtime:device:mellanox:spine2",
           "port": 50051,
           "deviceId": 0
         }
       },
       "piPipeconf": {
-        "piPipeconfId": "org.onosproject.pipelines.fabric.bmv2"
+        "piPipeconfId": "org.onosproject.pipelines.fabric"
       },
       "ports": {
         "1/0": {
@@ -32,7 +32,7 @@
       },
       "basic": {
         "driver": "mellanox-pro",
-        "name": "spine1"
+        "name": "spine2"
       }
     }
   }
diff --git a/p4-pod-configs/dev-pod/dev-pod.json b/p4-pod-configs/dev-pod/mwc-demo.json
similarity index 63%
rename from p4-pod-configs/dev-pod/dev-pod.json
rename to p4-pod-configs/dev-pod/mwc-demo.json
index dcfd6f8..2727de6 100644
--- a/p4-pod-configs/dev-pod/dev-pod.json
+++ b/p4-pod-configs/dev-pod/mwc-demo.json
@@ -24,7 +24,7 @@
         "adjacencySids": []
       }
     },
-    "device:mellanox:spine1": {
+    "device:cavium:spine1": {
       "segmentrouting": {
         "name": "spine1",
         "ipv4NodeSid": 226,
@@ -36,7 +36,7 @@
         "adjacencySids": []
       }
     },
-    "device:cavium:spine2": {
+    "device:mellanox:spine2": {
       "segmentrouting": {
         "name": "spine2",
         "ipv4NodeSid": 227,
@@ -53,9 +53,23 @@
     "device:tofino:leaf1/180": {
       "interfaces": [
         {
-          "name": "leaf1-3/0",
+          "name": "leaf1-3/0-compute-1",
           "ips": [
-            "10.6.1.254/24"
+            "10.6.1.254/24",
+            "118.0.0.254/24",
+            "119.0.0.254/24"
+          ],
+          "vlan-untagged": 10
+        }
+      ]
+    },
+    "device:tofino:leaf1/181": {
+      "interfaces": [
+        {
+          "name": "leaf1-3/1------mgmt-25-----enb",
+          "ips": [
+            "118.0.0.254/24",
+            "119.0.0.254/24"
           ],
           "vlan-untagged": 10
         }
@@ -64,13 +78,35 @@
     "device:tofino:leaf2/180": {
       "interfaces": [
         {
-          "name": "leaf2-3/0",
+          "name": "leaf2-3/0-compute-2",
           "ips": [
             "10.6.2.254/24"
           ],
           "vlan-untagged": 20
         }
       ]
+    },
+    "device:tofino:leaf2/181": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/1-------mgmt-26---enb",
+          "ips": [
+            "140.0.0.2/24"
+          ],
+          "vlan-untagged": 140
+        }
+      ]
+    },
+    "device:tofino:leaf2/182": {
+      "interfaces": [
+        {
+          "name": "leaf2-3/2-------mgmt-27---ARM",
+          "ips": [
+            "150.0.0.254/24"
+          ],
+          "vlan-untagged": 150
+        }
+      ]
     }
   }
 }
diff --git a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
index 44868dc..172c304 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
@@ -1,9 +1,10 @@
 {
   "devices": {
     "device:tofino:leaf1": {
+      "chassisId": "000000000204",
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.6.0.211",
+          "ip": "10.128.13.221",
           "deviceKeyId": "p4runtime:device:tofino:leaf1",
           "port": 50051,
           "deviceId": 0
@@ -44,22 +45,6 @@
           "number": 181,
           "removed": false,
           "type": "copper"
-        },
-        "3/2": {
-          "name": "3/2",
-          "speed": 10000,
-          "enabled": true,
-          "number": 182,
-          "removed": false,
-          "type": "copper"
-        },
-        "3/3": {
-          "name": "3/3",
-          "speed": 10000,
-          "enabled": true,
-          "number": 183,
-          "removed": false,
-          "type": "copper"
         }
       },
       "basic": {
diff --git a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
index a1cb7aa..19868d3 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
@@ -1,16 +1,17 @@
 {
   "devices": {
     "device:tofino:leaf2": {
+      "chassisId": "000000000205",
       "generalprovider": {
         "p4runtime": {
-          "ip": "10.6.0.212",
+          "ip": "10.128.13.222",
           "deviceKeyId": "p4runtime:device:tofino:leaf2",
           "port": 50051,
           "deviceId": 0
         }
       },
       "piPipeconf": {
-        "piPipeconfId": "org.onosproject.pipelines.fabric.mavericks"
+        "piPipeconfId": "org.onosproject.pipelines.fabric-spgw.mavericks"
       },
       "ports": {
         "1/0": {
@@ -52,14 +53,6 @@
           "number": 182,
           "removed": false,
           "type": "copper"
-        },
-        "3/3": {
-          "name": "3/3",
-          "speed": 10000,
-          "enabled": true,
-          "number": 183,
-          "removed": false,
-          "type": "copper"
         }
       },
       "basic": {