diff --git a/netconf-hive.nix b/netconf-hive.nix
index f9fc9f9..8441d70 100644
--- a/netconf-hive.nix
+++ b/netconf-hive.nix
@@ -119,9 +119,9 @@ in
       };
       # netcore01 (Potos)
       "xe-0/1/2".ethernet-switching = {
-        interface-mode = "access";
+        interface-mode = "trunk";
         vlans = [
-          "hypervisor"
+          "all"
         ];
       };
       # uplink
@@ -173,39 +173,25 @@ in
 
     dgn-interfaces =
       let
-        admin-intf.ethernet-switching = {
-          interface-mode = "trunk";
-          vlans = [ "all" ];
+        hypervisor.ethernet-switching = {
+          interface-mode = "access";
+          vlans = [ "hypervisor" ];
         };
       in
       {
-        "xe-0/1/0" = admin-intf;
-        "ge-0/1/0" = admin-intf;
-        "et-0/1/0" = admin-intf;
-        "xe-0/1/1" = admin-intf;
-        "ge-0/1/1" = admin-intf;
-        "et-0/1/1" = admin-intf;
-        "xe-0/1/2" = admin-intf;
-        "ge-0/1/2" = admin-intf;
-        "et-0/1/2" = admin-intf;
-        "xe-0/1/3" = admin-intf;
-        "ge-0/1/3" = admin-intf;
-        "et-0/1/3" = admin-intf;
-
-        "xe-0/2/0" = admin-intf;
-        "ge-0/2/0" = admin-intf;
-        "xe-0/2/1" = admin-intf;
-        "ge-0/2/1" = admin-intf;
-        "xe-0/2/2" = admin-intf;
-        "ge-0/2/2" = admin-intf;
-        "xe-0/2/3" = admin-intf;
-        "ge-0/2/3" = admin-intf;
-
-        "ge-0/0/47".ethernet-switching = {
+        "xe-0/2/0".ethernet-switching = {
           interface-mode = "trunk";
           vlans = [ "all" ];
         };
 
+        "ge-0/0/0" = hypervisor;
+        "ge-0/0/1" = hypervisor;
+        "ge-0/0/2" = hypervisor;
+        "ge-0/0/3" = hypervisor;
+        "ge-0/0/4" = hypervisor;
+        "ge-0/0/5" = hypervisor;
+        "ge-0/0/47" = hypervisor;
+
         # management
         "me0".inet.addresses = [ "192.168.2.2/24" ];
         "irb".inet6.addresses = [ "fd26:baf9:d250:8000::200f/64" ];