diff --git a/p4-pod-configs/dev-pod/hosts.json b/p4-pod-configs/dev-pod/hosts.json
index 21f8da3..dca6f5f 100644
--- a/p4-pod-configs/dev-pod/hosts.json
+++ b/p4-pod-configs/dev-pod/hosts.json
@@ -3,78 +3,141 @@
     "00:1E:67:D2:EC:7E/None": {
       "basic": {
         "name": "Compute Node 1",
-        "ips": ["10.6.1.3"],
-        "locations": ["device:tofino:leaf1/180"]
+        "ips": [
+          "10.6.1.3"
+        ],
+        "locations": [
+          "device:tofino:leaf1/180"
+        ]
       }
     },
     "00:AD:DE:00:00:80/None": {
       "basic": {
         "name": "eNodeB",
-        "ips": ["119.0.0.10", "118.0.0.10"],
-        "locations": ["device:tofino:leaf1/181"]
+        "ips": [
+          "119.0.0.10",
+          "118.0.0.10"
+        ],
+        "locations": [
+          "device:tofino:leaf1/181"
+        ]
       }
     },
     "00:1E:67:D2:EE:EE/None": {
       "basic": {
         "name": "Compute Node 2",
-        "ips": ["10.6.2.2"],
-        "locations": ["device:tofino:leaf2/180"]
+        "ips": [
+          "10.6.2.2"
+        ],
+        "locations": [
+          "device:tofino:leaf2/180"
+        ]
       }
     },
     "72:9D:0F:57:D5:BD/None": {
       "basic": {
         "name": "ARM Server",
-        "ips": ["150.0.0.10"],
-        "locations": ["device:tofino:leaf2/182"]
+        "ips": [
+          "150.0.0.10"
+        ],
+        "locations": [
+          "device:tofino:leaf2/182"
+        ]
       }
     },
     "fa:16:3e:95:0f:87/None": {
       "basic": {
         "name": "NGIC-DP-1",
-        "ips": ["119.0.0.2"],
-        "locations": ["device:tofino:leaf1/180"]
+        "ips": [
+          "119.0.0.2"
+        ],
+        "locations": [
+          "device:tofino:leaf1/180"
+        ]
       }
     },
     "fa:16:3e:64:cc:23/None": {
       "basic": {
         "name": "MME-1",
-        "ips": ["118.0.0.2"],
-        "locations": ["device:tofino:leaf1/180"]
+        "ips": [
+          "118.0.0.2"
+        ],
+        "locations": [
+          "device:tofino:leaf1/180"
+        ]
       }
     },
     "fa:16:3e:26:68:30/None": {
       "basic": {
         "name": "MME-2",
-        "ips": ["122.0.0.2"],
-        "locations": ["device:tofino:leaf2/180"]
+        "ips": [
+          "122.0.0.2"
+        ],
+        "locations": [
+          "device:tofino:leaf2/180"
+        ]
       }
     },
     "00:1E:67:D2:EE:EB/None": {
       "basic": {
         "name": "Head Node",
-        "ips": ["118.0.0.11"],
-        "locations": ["device:tofino:leaf1/182"]
+        "ips": [
+          "118.0.0.11"
+        ],
+        "locations": [
+          "device:tofino:leaf1/182"
+        ]
       }
     },
     "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:leaf2/172"]
+        "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:leaf2/172"
+        ]
       }
     },
     "52:74:B7:2C:04:F2/None": {
       "basic": {
         "name": "Internet simulator (INT source)",
-        "ips": ["160.0.1.1", "160.0.1.2", "160.0.1.3", "160.0.1.4", "160.0.1.5", "160.0.1.6", "160.0.1.7", "160.0.1.8", "160.0.1.9", "160.0.1.10"],
-        "locations": ["device:tofino:leaf1/172"]
+        "ips": [
+          "160.0.1.1",
+          "160.0.1.2",
+          "160.0.1.3",
+          "160.0.1.4",
+          "160.0.1.5",
+          "160.0.1.6",
+          "160.0.1.7",
+          "160.0.1.8",
+          "160.0.1.9",
+          "160.0.1.10"
+        ],
+        "locations": [
+          "device:tofino:leaf1/172"
+        ]
       }
     },
     "D0:50:99:C0:3B:20/None": {
       "basic": {
         "name": "INT report exporter (Netcope)",
-        "ips": ["10.6.1.100"],
-        "locations": ["device:tofino:leaf1/183"]
+        "ips": [
+          "10.6.1.100"
+        ],
+        "locations": [
+          "device:tofino:leaf1/183"
+        ]
       }
     }
   }
diff --git a/p4-pod-configs/mwc-pod/hosts.json b/p4-pod-configs/mwc-pod/hosts.json
index 01e8d89..f4deba6 100644
--- a/p4-pod-configs/mwc-pod/hosts.json
+++ b/p4-pod-configs/mwc-pod/hosts.json
@@ -3,64 +3,101 @@
     "00:1e:67:d2:ee:b2/None": {
       "basic": {
         "name": "Compute Node 1",
-        "ips": ["10.6.1.3"],
-        "locations": ["device:tofino:leaf1/144"]
+        "ips": [
+          "10.6.1.3"
+        ],
+        "locations": [
+          "device:tofino:leaf1/144"
+        ]
       }
     },
     "00:AD:DE:00:00:80/None": {
       "basic": {
         "name": "eNodeB",
-        "ips": ["119.0.0.10", "118.0.0.10"],
-        "locations": ["device:tofino:leaf1/145"]
+        "ips": [
+          "119.0.0.10",
+          "118.0.0.10"
+        ],
+        "locations": [
+          "device:tofino:leaf1/145"
+        ]
       }
     },
     "00:1e:67:d2:c9:8a/None": {
       "basic": {
         "name": "Compute Node 2",
-        "ips": ["10.6.2.2"],
-        "locations": ["device:tofino:leaf2/144"]
+        "ips": [
+          "10.6.2.2"
+        ],
+        "locations": [
+          "device:tofino:leaf2/144"
+        ]
       }
     },
     "72:9D:0F:57:D5:BD/None": {
       "basic": {
         "name": "ARM Server",
-        "ips": ["150.0.0.10"],
-        "locations": ["device:tofino:leaf2/146"]
+        "ips": [
+          "150.0.0.10"
+        ],
+        "locations": [
+          "device:tofino:leaf2/146"
+        ]
       }
     },
     "fa:16:3e:95:0f:87/None": {
       "basic": {
         "name": "NGIC-DP-1",
-        "ips": ["119.0.0.2"],
-        "locations": ["device:tofino:leaf1/144"]
+        "ips": [
+          "119.0.0.2"
+        ],
+        "locations": [
+          "device:tofino:leaf1/144"
+        ]
       }
     },
     "fa:16:3e:64:cc:23/None": {
       "basic": {
         "name": "MME-1",
-        "ips": ["118.0.0.2"],
-        "locations": ["device:tofino:leaf1/144"]
+        "ips": [
+          "118.0.0.2"
+        ],
+        "locations": [
+          "device:tofino:leaf1/144"
+        ]
       }
     },
     "fa:16:3e:49:75:ad/None": {
       "basic": {
         "name": "MME-2",
-        "ips": ["122.0.0.4"],
-        "locations": ["device:tofino:leaf2/144"]
+        "ips": [
+          "122.0.0.4"
+        ],
+        "locations": [
+          "device:tofino:leaf2/144"
+        ]
       }
     },
     "3c:fd:fe:a6:e7:09/None": {
       "basic": {
         "name": "vUE",
-        "ips": ["10.6.2.101"],
-        "locations": ["device:tofino:leaf2/152"]
+        "ips": [
+          "10.6.2.101"
+        ],
+        "locations": [
+          "device:tofino:leaf2/152"
+        ]
       }
     },
     "3c:fd:fe:a6:e7:08/None": {
       "basic": {
         "name": "vAppServer",
-        "ips": ["10.6.2.102"],
-        "locations": ["device:tofino:leaf2/160"]
+        "ips": [
+          "10.6.2.102"
+        ],
+        "locations": [
+          "device:tofino:leaf2/160"
+        ]
       }
     }
   }