diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 0d01226..b4d1944 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -16,6 +16,7 @@ hosts-inet:
     switch-c3d2-main: 10.0.0.14
     switch-a1: 10.0.0.15
     switch-a1-cpe: 10.0.0.16
+    switch-dach: 10.0.0.17
     ap1: 10.0.0.41
     ap2: 10.0.0.42
     ap3: 10.0.0.43
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 5e83463..4c766d0 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -612,10 +612,10 @@ switches:
         mode: access
         ports: '2'
         nostp: true
-      up3:
-        mode: access
-        ports: '3'
-        nostp: true
+      # up3:
+      #   mode: access
+      #   ports: '3'
+      #   nostp: true
       up4:
         mode: access
         ports: '4'
@@ -624,10 +624,15 @@ switches:
         mode: access
         ports: '5'
         nostp: true
-      # "Antenne Dach"
-      bmx:
-        mode: access
+      # "Antenne"
+      switch-dach:
+        mode: trunk
         ports: '6'
+        vlans:
+          - mgmt
+          - pub
+          - bmx
+          - up3
       iso1:
         mode: access
         ports: '9'
@@ -921,3 +926,41 @@ switches:
       J31/Ng==
       =e45t
       -----END PGP MESSAGE-----
+
+  switch-dach:
+    model: 'HP-procurve-2824'
+    location: Dach
+    ports:
+      mgmt:
+        mode: access
+        ports: '1'
+      switch-c1:
+        mode: trunk
+        ports: '24'
+        vlans:
+          - mgmt
+          - pub
+          - bmx
+          - up3
+      # Starlink
+      up3:
+        mode: access
+        ports: '3'
+        nostp: true
+      # Freifunk Mesh-on-LAN
+      bmx:
+        mode: access
+        ports: '10-19'
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQgAhPMG6VKUFLVNZmVfZ6P21CrXRmUeExuxIg4QIrYtKfYe
+      cxWst/IuHnDyL2TP8yGb00sjz7o0psZ9Z+zRCi/ONONyNzee103ymjXxk0Ygekid
+      1IGVeSTqskrgOl53mFZEfP4nBcOqzcNFjMkm0c5B2OmHHHOokOJ5Xzsya120SGXk
+      JnYFVsRD6GFwuF88pgQ5VrGd5/drMaIrNkJ69dyfvYdHRTd0UgtiZFOMesRYFFP7
+      +QdSW1MFoVZnjZgLeoNF/efIhHnTdClROCMZBYU5Z3pQcHAfE4GN3w+MceP/+5EY
+      z3wuSNpsuYNr8NnEDvofTJGdOLuclE6JPFvJMg1QptJKASfn3ZlOrL4ohbPGaDQ6
+      z1P+6DJXliXS7dBdxH0bsB2qRZslmcj286D9bPgTsuvCzOaxcTtkM8y76gVVOVBI
+      TN+j1/OdlXyVmTM=
+      =XUUi
+      -----END PGP MESSAGE-----