diff --git a/trellis/trellis.json b/trellis/trellis.json
index 8aef52a..e592753 100644
--- a/trellis/trellis.json
+++ b/trellis/trellis.json
@@ -159,25 +159,25 @@
         "00:bb:00:00:00:01/None": {
             "basic": {
                 "ips": ["2000::201"],
-                "location": "of:0000000000000204/5"
+                "locations": ["of:0000000000000204/5"]
             }
         },
         "00:bb:00:00:00:02/None": {
             "basic": {
                 "ips": ["2000::202"],
-                "location": "of:0000000000000204/6"
+                "locations": ["of:0000000000000204/6"]
             }
         },
         "00:bb:00:00:00:03/None": {
             "basic": {
                 "ips": ["2000::301"],
-                "location": "of:0000000000000205/5"
+                "locations": ["of:0000000000000205/5"]
             }
         },
         "00:bb:00:00:00:04/None": {
             "basic": {
                 "ips": ["2000::302"],
-                "location": "of:0000000000000205/6"
+                "locations": ["of:0000000000000205/6"]
             }
         }
     },
diff --git a/trellis/trellis_dualhome.json b/trellis/trellis_dualhome.json
index 27cc620..31dc604 100644
--- a/trellis/trellis_dualhome.json
+++ b/trellis/trellis_dualhome.json
@@ -207,25 +207,25 @@
         "00:bb:00:00:00:01/None": {
             "basic": {
                 "ips": ["2000::201"],
-                "location": "of:0000000000000204/8"
+                "locations": ["of:0000000000000204/8"]
             }
         },
         "00:bb:00:00:00:02/None": {
             "basic": {
                 "ips": ["2000::202"],
-                "location": "of:0000000000000204/9"
+                "locations": ["of:0000000000000204/9"]
             }
         },
         "00:bb:00:00:00:03/None": {
             "basic": {
                 "ips": ["2000::301"],
-                "location": "of:0000000000000205/8"
+                "locations": ["of:0000000000000205/8"]
             }
         },
         "00:bb:00:00:00:04/None": {
             "basic": {
                 "ips": ["2000::302"],
-                "location": "of:0000000000000205/9"
+                "locations": ["of:0000000000000205/9"]
             }
         }
     },
diff --git a/trellis/trellis_remote_dhcp.json b/trellis/trellis_remote_dhcp.json
index 0c9e767..cfc30fc 100644
--- a/trellis/trellis_remote_dhcp.json
+++ b/trellis/trellis_remote_dhcp.json
@@ -151,25 +151,25 @@
         "00:bb:00:00:00:01/None": {
             "basic": {
                 "ips": ["2000::201"],
-                "location": "of:0000000000000204/5"
+                "locations": ["of:0000000000000204/5"]
             }
         },
         "00:bb:00:00:00:02/None": {
             "basic": {
                 "ips": ["2000::202"],
-                "location": "of:0000000000000204/6"
+                "locations": ["of:0000000000000204/6"]
             }
         },
         "00:bb:00:00:00:03/None": {
             "basic": {
                 "ips": ["2000::301"],
-                "location": "of:0000000000000205/5"
+                "locations": ["of:0000000000000205/5"]
             }
         },
         "00:bb:00:00:00:04/None": {
             "basic": {
                 "ips": ["2000::302"],
-                "location": "of:0000000000000205/6"
+                "locations": ["of:0000000000000205/6"]
             }
         }
     },
diff --git a/trellis/trellis_vlan.json b/trellis/trellis_vlan.json
index f08093b..461c16e 100644
--- a/trellis/trellis_vlan.json
+++ b/trellis/trellis_vlan.json
@@ -152,25 +152,25 @@
         "00:bb:00:00:00:01/None": {
             "basic": {
                 "ips": ["2000::201"],
-                "location": "of:0000000000000204/5"
+                "locations": ["of:0000000000000204/5"]
             }
         },
         "00:bb:00:00:00:02/None": {
             "basic": {
                 "ips": ["2000::202"],
-                "location": "of:0000000000000204/6"
+                "locations": ["of:0000000000000204/6"]
             }
         },
         "00:bb:00:00:00:03/None": {
             "basic": {
                 "ips": ["2000::301"],
-                "location": "of:0000000000000205/5"
+                "locations": ["of:0000000000000205/5"]
             }
         },
         "00:bb:00:00:00:04/None": {
             "basic": {
                 "ips": ["2000::302"],
-                "location": "of:0000000000000205/6"
+                "locations": ["of:0000000000000205/6"]
             }
         }
     },