diff --git a/config/ap.nix b/config/ap.nix
index a47d3f8..860d6cd 100644
--- a/config/ap.nix
+++ b/config/ap.nix
@@ -630,7 +630,7 @@
         c3d2 = {
           ports = [ "lan:2" "lan:3" "lan:4" ];
         };
-        switch-d1 = {
+        switch-d2 = {
           ports = [ "wan" ];
         };
       };
@@ -1822,7 +1822,7 @@
         priv21 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-d1 = {
+        switch-d2 = {
           ports = [ "wan" ];
         };
       };
diff --git a/config/switch.nix b/config/switch.nix
index ba807ff..8b23f81 100644
--- a/config/switch.nix
+++ b/config/switch.nix
@@ -237,8 +237,9 @@
           group = "1";
           ports = [ "1" ];
         };
+        switch-d2.ports = [ "3" ];
+
         # Turm D APs
-        ap3.ports = [ "3" ];
         ap7.ports = [ "8" ];
         ap9.ports = [ "5" ];
         ap10.ports = [ "4" ];
@@ -247,6 +248,21 @@
       };
     };
 
+    switch-d2 = {
+      role = "switch";
+      model = "dumb";
+      location = "Turm D Durchgang 1. Etage";
+
+      links = {
+        switch-d1 = {
+          group = "1";
+          ports = [ "1" ];
+        };
+        ap3.ports = [ "1" ];
+        ap59.ports = [ "2" ];
+      };
+    };
+
     switch-dach = {
       role = "switch";
       model = "HP-procurve-2824";
diff --git a/nix/pkgs/device-templates.nix b/nix/pkgs/device-templates.nix
index 3b40d7e..53c8a0c 100644
--- a/nix/pkgs/device-templates.nix
+++ b/nix/pkgs/device-templates.nix
@@ -20,8 +20,9 @@ let
         }.${role}
       )
     ) (
-      filterAttrs (_: { role, ... }:
-        role == "ap" || role == "switch"
+      filterAttrs (_: { role, model, ... }:
+        role == "ap" ||
+        (role == "switch" && model != "dumb")
       ) config.site.hosts
     );