diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index b3097c7..04aa0a5 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -158,7 +158,7 @@ switches:
           - GigabitEthernet1/0/47
           - GigabitEthernet1/0/48
           - GigabitEthernet1/0/24
-        vlans:
+        vlans: &server1_vlans
           - mgmt
           - pub
           - core
@@ -213,22 +213,15 @@ switches:
           - priv38
           - priv39
           - priv40
-      c3d2-server4:
+      server2:
         mode: bond
         group: 1
         ports:
+          - GigabitEthernet1/0/12
           - GigabitEthernet1/0/38
           - GigabitEthernet1/0/39
           - GigabitEthernet1/0/40
-        vlans: &server_vlans
-          - mgmt
-          - pub
-          - core
-          - serv
-          - c3d2
-          - cluster
-          - bmx
-          - priv23
+        vlans: *server1_vlans
       c3d2-server5:
         mode: bond
         group: 6
@@ -265,11 +258,6 @@ switches:
           - GigabitEthernet1/0/37
           - GigabitEthernet1/0/13
         vlans: *server_vlans
-      serv:
-        mode: access
-        ports:
-          # marenz
-          - GigabitEthernet1/0/12
       c3d2-monit:
         mode: trunk
         ports: