diff --git a/contact.md.asc b/contact.md.asc
index 48caee9..d753e11 100644
--- a/contact.md.asc
+++ b/contact.md.asc
@@ -1,39 +1,39 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-=9WQB
+hQEMA2PKcvDMvlKLAQf/c0IdcrC0e9EB6Jht2hz8VcyFeFHBOuZCRDFlFxWZ/gNi
+uWbVFEPXb/D69Mr7rxfErolIrE4I1/AAuaXPWU3y6WHTnUoaP9XnMG71BS29dvJQ
+Vbg6dy9s/BCiQEB8IsWby7MahggMIpfkdLTK2XQhWV9AYq4oWkSPpbZ2Fx55hVXM
+s/Y8HaNIhFiObjwTVf9qLS2wN0cmMU6KSxzqkdfSpgCQT66F+qjy4LlLWo2V4YIk
+EmL/rGTDqBNfJ6NER+XNH9MXxVQ3U80aC29j2VCC+7l+C+ruAckRagIqQcHPl3fF
+5TTLxYfuaevLMGh98HSbMuX6a2UxZMy7L6nWsCxmFNLqAfE4X4nqMHuadMbWQxqe
+6YVdXpIuJX3zz7esNkk1wD3w8KXIFqyMUrQ12O40hnbL2hd5zSozcG8MLLDbD8SO
+MKGHx+z+u+ryLMczUI/1dita6QWO4z8H9M1Rzq9YIVushTzcxE9NPz05AC6dQTtk
+FDL+iX35zL0S7K7cNcuXmNa3bRGvwV6/+zCYSeVpptMqdJb1IETGkFYuv+N92fmt
+AdrO4H3pR+vKT7ai07PAjO3j1V0aQWJtnb2SYjxQZtpzAYq9AlAkO0zYpRsnwiax
+oozPybD9JJcm0m4EID/NRSAsSoY9G/IfnuUB/GVc+My3BA/KIhq1FZbBe1MF7/Vn
+YZmeP3QImQahOxnuDMYfqimOsGSp0gnbmguufUvK8d8CN4lisXr0tZW/z26Z6hEt
+CNfYX0nKDQjcLQhVIep7OUkLtOAMdYhjZw/mtjdvrn2861IG722dvKTo6zUA4fyB
+6RTBaoYv3usXi+8yQlKQ5pWNjzdPaXSo0FjpJrjbCf5hMiZUfd7HW6e97hRXAz2v
+bCefCqnA8tvUNscgEy0Rp3+f5kElgbd95iWL92llS+B77DACNy/Ljvoavc4lDo9f
+w3fT/zxGtsx3S9idjc8Auh6dRzEPjtCmtq8sll/WTB57iXTQO+h6HoDCBprRMvKC
+ck/trCgW7E8fj/JA6Payrx5ZRjpUsTfcRaEk8MrkxGrJovnr4o7RsnDTcpaIsHqI
+vONoyl6RcwdPSwlzDdR5oj6weihY5hQbRoUMAxnvsRwOLWxpBSU98vVUSFLl7YHy
+6LQ9ANrUwwvbkzd8UhVkCz15xSBbjuc+aAYkpYbDLesL257FLLoeDuXMQQcE2izn
+L3GnoklXqKmVaqS+ttwgewjWQIE37ptRnmff8WCwt7FO9RZMmjcoRY8TVO1fhroD
+dzdv2GEpckdg+1aY9esShoMd30JXkOPaqIQRUtWMM7wTGrr6GMG+ujDO1CJjg77F
+puxIINafJAU5m6+rL5Oe6IFt2Ts/1D1e+UKS2nYGJRZbdOT6eGp/mssZfj6gx1yK
+zFQn32bvlupDWz+U12D3+PHG571T9QuiBnObOxvohI3FKjjaVtsO/q2KuC9Ymwdq
+PhvKxyLfIj399ZSodT/wDkNGiYAwZJcmnLmKhOpxyM1WTsHvsPsZEz2SaNENGFNQ
+zc5v9NRql0oLcr+8laDi0HWelJxLrYTJSWJbEFDqMcqR5w93ljbcYdA1fPKvmtE1
+kQGgOAgmkyAeS96VVX8U8UK/gzE1jU3oHgxOkdVmZ8+iPSLWTuSSgoh+VYpiBQk1
+34afxWfdb+3bfUeb2c1IOJtKicTvbmP+XuRnPbp96OGoDwywC0KDIL8fLeJDhvMQ
+D8C535rKD9qjHnyWY4E2Lxq8qic/JY0Deit0pKC/Fty/VnMl+59otVKS9gdqDcpn
+eH90ylHxcrSfN9wCsR4/3smJmhNXXupCMBPo5tU2NLF9cm0733+AxcegXE3FgoAU
+2yHKCvg8AT6mTbP2S0Y4gyQgrRCDVD/BttfKzbdNN/tgZDKL0GJ5twGnlnKYjxty
+rHcKbwZSaVghD6oP8RUREM0JJja7XCwZ5QnXuBDAQ2+d2cKKHjJwaTy26TmPZ/91
+kYYcYrfzPhcXmIPj7oTxb6JX+x2AvxXX9TIktxeQz1A1vCoDQHs2v15409zS5xvu
+ERjyy6R+sUDdBGXOFpjHDDhf/4SCqyOEOxKh9LAO6PfCUHZ86Mvfe+t9BuXN0pWw
+BZ+ilM7lBY1y4QGPSCW1fue/UmtX0gbr+8Qr4R7JONGfJ9sYnMlAnO19qY6KMzPo
+8pNtVraMnXniPn72R0LxZMHIVcFuuM4syO/MonzCNXjTber2vr7Vsu1Tl0M=
+=2OH4
 -----END PGP MESSAGE-----
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 72c58b7..d33c9cd 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -587,12 +587,14 @@ switches:
       iso6:
         mode: access
         ports: '14'
-      ap34:
+      # Saal A Foyer
+      ap21:
         mode: trunk
         ports: 20
         vlans:
           - mgmt
           - pub
+      # Saal A Buehne
       switch-a1:
         mode: bond
         ports: 15-16
@@ -775,10 +777,12 @@ switches:
     model: 'TL-SG3210'
     location: Saal A
     ports:
-      mgmt:
+      # DS19 hackcenter
+      pub:
         mode: access
         ports:
           - 1
+          - 2
       switch-c1:
         mode: trunk
         ports: 7,1/0/8
@@ -786,10 +790,6 @@ switches:
           - mgmt
           - pub
           - priv25
-      priv25:
-        mode: access
-        ports:
-          - 2
       ap32:
         mode: trunk
         ports: 3
@@ -802,20 +802,22 @@ switches:
         vlans:
           - mgmt
           - pub
-      ap-tmp1:
+      ap17:
         mode: trunk
         ports: 5
         vlans:
           - mgmt
           - pub
           - priv25
-      ap-tmp2:
+          - iso4
+      ap3:
         mode: trunk
         ports: 6
         vlans:
           - mgmt
           - pub
           - priv25
+          - iso4
     password: |
       -----BEGIN PGP MESSAGE-----