diff --git a/salt-pillar/bird/radv.sls b/salt-pillar/bird/radv.sls
index 375c66f..49d3ac1 100644
--- a/salt-pillar/bird/radv.sls
+++ b/salt-pillar/bird/radv.sls
@@ -17,201 +17,11 @@ radv:
         - dnscache.serv
       dnssl:
         - hq.c3d2.de
-  priv1-gw:
-    priv1:
+{%- for i in range(1, 62) %}
+  priv{{ i }}-gw:
+    priv{{ i }}:
       rdnss:
         - dnscache.serv
       dnssl:
-        - priv1.zentralwerk.org
-  priv2-gw:
-    priv2:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv2.zentralwerk.org
-  priv3-gw:
-    priv3:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv3.zentralwerk.org
-  priv4-gw:
-    priv4:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv4.zentralwerk.org
-  priv5-gw:
-    priv5:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv5.zentralwerk.org
-  priv6-gw:
-    priv6:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv6.zentralwerk.org
-  priv7-gw:
-    priv7:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv7.zentralwerk.org
-  priv8-gw:
-    priv8:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv8.zentralwerk.org
-  priv9-gw:
-    priv9:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv9.zentralwerk.org
-  priv10-gw:
-    priv10:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv10.zentralwerk.org
-  priv11-gw:
-    priv11:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv11.zentralwerk.org
-  priv12-gw:
-    priv12:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv12.zentralwerk.org
-  priv13-gw:
-    priv13:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv13.zentralwerk.org
-  priv14-gw:
-    priv14:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv14.zentralwerk.org
-  priv15-gw:
-    priv15:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv15.zentralwerk.org
-  priv16-gw:
-    priv16:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv16.zentralwerk.org
-  priv17-gw:
-    priv17:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv17.zentralwerk.org
-  priv18-gw:
-    priv18:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv18.zentralwerk.org
-  priv19-gw:
-    priv19:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv19.zentralwerk.org
-  priv20-gw:
-    priv20:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv20.zentralwerk.org
-  priv21-gw:
-    priv21:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv21.zentralwerk.org
-  priv22-gw:
-    priv22:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv22.zentralwerk.org
-  priv23-gw:
-    priv23:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv23.zentralwerk.org
-  priv24-gw:
-    priv24:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv24.zentralwerk.org
-  priv25-gw:
-    priv25:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv25.zentralwerk.org
-  priv26-gw:
-    priv26:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv26.zentralwerk.org
-  priv27-gw:
-    priv27:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv27.zentralwerk.org
-  priv28-gw:
-    priv28:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv28.zentralwerk.org
-  priv29-gw:
-    priv29:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv29.zentralwerk.org
-  priv30-gw:
-    priv30:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv30.zentralwerk.org
-  priv31-gw:
-    priv31:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv31.zentralwerk.org
-  priv32-gw:
-    priv32:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv32.zentralwerk.org
-  priv33-gw:
-    priv33:
-      rdnss:
-        - dnscache.serv
-      dnssl:
-        - priv33.zentralwerk.org
+        - priv{{ i }}.zentralwerk.org
+{%- endfor %}
diff --git a/salt-pillar/vlans/init.sls b/salt-pillar/vlans/init.sls
index 4200be6..d94a52c 100644
--- a/salt-pillar/vlans/init.sls
+++ b/salt-pillar/vlans/init.sls
@@ -11,62 +11,14 @@ vlans:
   c3d2: 5
   bmx: 7
   # Modems
-  up1: 10
-  up2: 11
-  up3: 12
-  up4: 13
-  up5: 14
-  up6: 15
-  up7: 16
-  up8: 17
+{%- for i in range(1, 9) %}
+  up{{ i }}: {{ i + 9 }}
+{%- endfor %}
   # Neighbor subnets
-  priv1: 40
-  priv2: 41
-  priv3: 42
-  priv4: 43
-  priv5: 44
-  priv6: 45
-  priv7: 46
-  priv8: 47
-  priv9: 48
-  priv10: 49
-  priv11: 50
-  priv12: 51
-  priv13: 52
-  priv14: 53
-  priv15: 54
-  priv16: 55
-  priv17: 56
-  priv18: 57
-  priv19: 58
-  priv20: 59
-  priv21: 60
-  priv22: 61
-  priv23: 62
-  priv24: 63
-  priv25: 64
-  priv26: 65
-  priv27: 66
-  priv28: 67
-  priv29: 68
-  priv30: 69
-  priv31: 70
-  priv32: 71
-  priv33: 72
+{%- for i in range(1, 62) %}
+  priv{{ i }}: {{ i + 39 }}
+{%- endfor %}
   # Isolated neighbors directly connection with their modems
-  iso1: 101
-  iso2: 102
-  iso3: 103
-  iso4: 104
-  iso5: 105
-  iso6: 106
-  iso7: 107
-  iso8: 108
-  iso9: 109
-  iso10: 110
-  iso11: 111
-  iso12: 112
-  iso13: 113
-  iso14: 114
-  iso15: 115
-  iso16: 116
+{%- for i in range(1, 17) %}
+  iso{{ i }}: {{ i + 100 }}
+{%- endfor %}
diff --git a/subnets.md b/subnets.md
index dbf05e3..29c0ba7 100644
--- a/subnets.md
+++ b/subnets.md
@@ -73,7 +73,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
 * fd23:42:c3d2:5cd::/64 PRIV14
 * fd23:42:c3d2:5ce::/64 PRIV15
 * fd23:42:c3d2:5cf::/64 PRIV16
-* […] PRIV24
+* […] PRIV61
 
 # Peer C3D2:
 
@@ -107,4 +107,4 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
     * 2a02:8106:211:e9cd::/64 PRIV14
     * 2a02:8106:211:e9ce::/64 PRIV15
     * 2a02:8106:211:e9cf::/64 PRIV16
-    * […] PRIV24
+    * […] PRIV61