diff --git a/p4-pod-configs/dev-pod/sr-conf-base.json b/p4-pod-configs/dev-pod/sr-conf-base.json
index c2e62cf..8ba63e3 100644
--- a/p4-pod-configs/dev-pod/sr-conf-base.json
+++ b/p4-pod-configs/dev-pod/sr-conf-base.json
@@ -29,7 +29,7 @@
     "device:tofino:leaf1/180": {
       "interfaces": [
         {
-          "name": "leaf1/3/0--compute-1",
+          "name": "leaf1/3/0--compute-1--ens802f0",
           "ips": [
             "10.6.1.254/24",
             "118.0.0.254/24",
@@ -52,15 +52,7 @@
       ]
     },
     "device:tofino:leaf1/182": {
-      "interfaces": [
-        {
-          "name": "leaf1/3/2--head-node-ProgRAN",
-          "ips": [
-            "118.0.0.254/24"
-          ],
-          "vlan-untagged": 10
-        }
-      ]
+      "interfaces": [ ]
     },
     "device:tofino:leaf1/183": {
       "interfaces": [
@@ -107,6 +99,9 @@
         }
       ]
     },
+    "device:tofino:leaf2/183": {
+      "interfaces": [ ]
+    },
     "device:tofino:leaf1/172": {
       "interfaces": [
         {
diff --git a/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json b/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
new file mode 100644
index 0000000..840d33b
--- /dev/null
+++ b/p4-pod-configs/dev-pod/sr-conf-int-to-compute-1.json
@@ -0,0 +1,43 @@
+{
+  "ports": {
+    "device:tofino:leaf2/172": {
+      "interfaces": [ ]
+    },
+    "device:tofino:leaf2/183": {
+      "interfaces": [ ]
+    },
+    "device:tofino:leaf1/182": {
+      "interfaces": [
+        {
+          "name": "leaf1/3/2--compute-1--ens802f1",
+          "ips": [
+            "160.0.2.254/24"
+          ],
+          "vlan-untagged": 162
+        }
+      ]
+    }
+  },
+  "hosts": {
+    "52:74:B7:2C:04:F1/None": {
+      "basic": {
+        "name": "UE simulator (INT sink)",
+        "ips": [
+          "160.0.2.1",
+          "160.0.2.2",
+          "160.0.2.3",
+          "160.0.2.4",
+          "160.0.2.5",
+          "160.0.2.6",
+          "160.0.2.7",
+          "160.0.2.8",
+          "160.0.2.9",
+          "160.0.2.10"
+        ],
+        "locations": [
+          "device:tofino:leaf1/182"
+        ]
+      }
+    }
+  }
+}
diff --git a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
index b5cc5aa..76f0dce 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
@@ -11,7 +11,7 @@
         }
       },
       "piPipeconf": {
-        "piPipeconfId": "org.onosproject.pipelines.fabric-spgw-int.mavericks"
+        "piPipeconfId": "org.onosproject.pipelines.fabric-spgw-int-1.mavericks"
       },
       "ports": {
         "1/0": {
diff --git a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
index a2cdd31..cf58289 100644
--- a/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
+++ b/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
@@ -11,7 +11,7 @@
         }
       },
       "piPipeconf": {
-        "piPipeconfId": "org.onosproject.pipelines.fabric-spgw-int.mavericks"
+        "piPipeconfId": "org.onosproject.pipelines.fabric-spgw-int-2.mavericks"
       },
       "ports": {
         "1/0": {