diff --git a/netconf-hive.nix b/netconf-hive.nix
index ef8ec55..8ce7655 100644
--- a/netconf-hive.nix
+++ b/netconf-hive.nix
@@ -41,24 +41,24 @@ in
     deployment.targetHost = "netcore02.dgn";
     vlans = vlansPlan;
     protocols.rstp = [
-      "ge-0/0/0"
-      "ge-0/0/1"
-      "ge-0/0/2"
-      "ge-0/0/3"
-      "ge-0/0/4"
-      "ge-0/0/5"
-      "ge-0/0/6"
-      "ge-0/0/7"
-      "ge-0/0/8"
-      "ge-0/0/9"
-      "ge-0/0/10"
-      "ge-0/0/11"
-      "ge-0/0/12"
-      "ge-0/0/13"
-      "ge-0/0/14"
-      "ge-0/0/15"
-      "ge-0/0/16"
-      "ge-0/0/17"
+      # "ge-0/0/0"
+      # "ge-0/0/1"
+      # "ge-0/0/2"
+      # "ge-0/0/3"
+      # "ge-0/0/4"
+      # "ge-0/0/5"
+      # "ge-0/0/6"
+      # "ge-0/0/7"
+      # "ge-0/0/8"
+      # "ge-0/0/9"
+      # "ge-0/0/10"
+      # "ge-0/0/11"
+      # "ge-0/0/12"
+      # "ge-0/0/13"
+      # "ge-0/0/14"
+      # "ge-0/0/15"
+      # "ge-0/0/16"
+      # "ge-0/0/17"
       "ge-0/0/42"
       "ge-0/0/43"
       "ge-0/0/47"
@@ -68,24 +68,24 @@ in
       "ge-0/1/3"
     ];
     interfaces = {
-      "ge-0/0/0" = AP-staging;
-      "ge-0/0/1" = AP-staging;
-      "ge-0/0/2" = AP-staging;
-      "ge-0/0/3" = AP-staging;
-      "ge-0/0/4" = AP-staging;
-      "ge-0/0/5" = AP-staging;
-      "ge-0/0/6" = AP-staging;
-      "ge-0/0/7" = AP-staging;
-      "ge-0/0/8" = AP-staging;
-      "ge-0/0/9" = AP-staging;
-      "ge-0/0/10" = AP-staging;
-      "ge-0/0/11" = AP-staging;
-      "ge-0/0/12" = AP-staging;
-      "ge-0/0/13" = AP-staging;
-      "ge-0/0/14" = AP-staging;
-      "ge-0/0/15" = AP-staging;
-      "ge-0/0/16" = AP-staging;
-      "ge-0/0/17" = AP-staging;
+      # "ge-0/0/0" = AP-staging;
+      # "ge-0/0/1" = AP-staging;
+      # "ge-0/0/2" = AP-staging;
+      # "ge-0/0/3" = AP-staging;
+      # "ge-0/0/4" = AP-staging;
+      # "ge-0/0/5" = AP-staging;
+      # "ge-0/0/6" = AP-staging;
+      # "ge-0/0/7" = AP-staging;
+      # "ge-0/0/8" = AP-staging;
+      # "ge-0/0/9" = AP-staging;
+      # "ge-0/0/10" = AP-staging;
+      # "ge-0/0/11" = AP-staging;
+      # "ge-0/0/12" = AP-staging;
+      # "ge-0/0/13" = AP-staging;
+      # "ge-0/0/14" = AP-staging;
+      # "ge-0/0/15" = AP-staging;
+      # "ge-0/0/16" = AP-staging;
+      # "ge-0/0/17" = AP-staging;
 
       "ge-0/0/42" = {
         enable = true;
@@ -96,6 +96,15 @@ in
         };
       };
       "ge-0/0/43" = AP-staging;
+      "ge-0/0/46" = {
+        # uplink oob
+        enable = true;
+        unit."0".family.ethernet-switching = {
+          enable = true;
+          interface-mode = "access";
+          vlans = [ 500 ];
+        };
+      };
       "ge-0/0/47" = {
         # ilo
         enable = true;
@@ -121,6 +130,7 @@ in
           interface-mode = "trunk";
           vlans = [
             "users"
+            "ap-staging"
             "admin-ap"
             "admin-core"
           ];
@@ -158,22 +168,22 @@ in
     vlans = vlansPlan;
 
     protocols.rstp = [
-      "ge-0/0/0"
-      "ge-0/0/1"
-      "ge-0/0/2"
-      "ge-0/0/3"
-      "ge-0/0/4"
-      "ge-0/0/5"
+      # "ge-0/0/0"
+      # "ge-0/0/1"
+      # "ge-0/0/2"
+      # "ge-0/0/3"
+      # "ge-0/0/4"
+      # "ge-0/0/5"
 
       "xe-0/1/0"
     ];
     interfaces = {
-      "ge-0/0/0" = AP-staging;
-      "ge-0/0/1" = AP-staging;
-      "ge-0/0/2" = AP-staging;
-      "ge-0/0/3" = AP-staging;
-      "ge-0/0/4" = AP-staging;
-      "ge-0/0/5" = AP-staging;
+      # "ge-0/0/0" = AP-staging;
+      # "ge-0/0/1" = AP-staging;
+      # "ge-0/0/2" = AP-staging;
+      # "ge-0/0/3" = AP-staging;
+      # "ge-0/0/4" = AP-staging;
+      # "ge-0/0/5" = AP-staging;
 
       "xe-0/1/0" = {
         enable = true;