diff --git a/.forgejo/workflows/deploy-docs.yaml b/.forgejo/workflows/deploy-docs.yaml
index 537d983..8ece046 100644
--- a/.forgejo/workflows/deploy-docs.yaml
+++ b/.forgejo/workflows/deploy-docs.yaml
@@ -67,7 +67,7 @@ jobs:
         run: |
           rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" site/ infra-docs-deploy@public-web-static.hosts.hamburg.ccc.de:/var/www/infra-docs.hamburg.ccc.de/
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v7
         if: github.event_name == 'pull_request'
         with:
           name: docs-build
diff --git a/resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone b/resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone
index e06c4a2..9db7051 100644
--- a/resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone
+++ b/resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone
@@ -7,8 +7,8 @@ $TTL 7200
                 3600000
                 86400 )
 
-        IN  NS  auth-dns.hamburg.ccc.de.
-		IN	NS	ns.vie.ccc.de.
+@ NS auth-dns.hamburg.ccc.de.
+@ NS erfadns.ber.ccc.de.
 
 ; ccchh firewall / tunnelendpunkte:
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0	IN	PTR	fwhh.hamburg.ccc.de.
diff --git a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone
index 7a2aafd..2a69ea8 100644
--- a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone
+++ b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone
@@ -8,7 +8,7 @@ $TTL 60	; 1 minutes
   )
 
 @ NS auth-dns.hamburg.ccc.de.
-@ NS ns.vie.ccc.de.
+@ NS erfadns.ber.ccc.de.
 
 
 ;
diff --git a/resources/chaosknoten/auth-dns/zones/diday.org.zone b/resources/chaosknoten/auth-dns/zones/diday.org.zone
index 18e3efb..2aeefcf 100644
--- a/resources/chaosknoten/auth-dns/zones/diday.org.zone
+++ b/resources/chaosknoten/auth-dns/zones/diday.org.zone
@@ -8,7 +8,7 @@ $TTL 3600  ; 1 minutes
   )
 
 @ NS auth-dns.hamburg.ccc.de.
-@ NS ns.vie.ccc.de.
+@ NS erfadns.ber.ccc.de.
 
 
 
diff --git a/resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone b/resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone
index 2820b68..5879c18 100644
--- a/resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone
+++ b/resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone
@@ -7,8 +7,8 @@ $TTL 7200
                 3600000
                 86400 )
 
-        IN  NS  auth-dns.hamburg.ccc.de.
-		IN	NS	ns.vie.ccc.de.
+@ NS auth-dns.hamburg.ccc.de.
+@ NS erfadns.ber.ccc.de.
 
 		IN	MX	5 nomail.ccc.de.
 		;IN	MX	10 local-mail.hamburg.ccc.de.
diff --git a/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone b/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone
index 32d9d04..a34c183 100644
--- a/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone
+++ b/resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone
@@ -7,8 +7,8 @@ $TTL 600
                 3600000
                 86400 )
 
-        IN  NS  auth-dns.hamburg.ccc.de.
-		IN	NS	ns.vie.ccc.de.
+@ NS auth-dns.hamburg.ccc.de.
+@ NS erfadns.ber.ccc.de.
 
 		IN	A	212.12.48.125
 		IN	AAAA	2a00:14b0:4200:3000:125::1
diff --git a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone
index 8c30fb4..33f8a31 100644
--- a/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone
+++ b/resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone
@@ -14,8 +14,8 @@ $TTL 7200
                                                         3600000
                                                         86400 )
 
-                                    IN  NS              ns.hamburg.ccc.de.
-                                    IN  NS              ns.vie.ccc.de.
+@ NS auth-dns.hamburg.ccc.de.
+@ NS erfadns.ber.ccc.de.
 
 $TTL 60
                                     IN  MX 10           cow.hamburg.ccc.de.
diff --git a/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone
index 35794ba..41b7f26 100644
--- a/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone
+++ b/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone
@@ -15,8 +15,8 @@ $TTL 7200
                 3600000
                 86400 )
 
-		IN	NS	ns.hamburg.ccc.de.
-		IN	NS	ns.vie.ccc.de.
+@ NS auth-dns.hamburg.ccc.de.
+@ NS erfadns.ber.ccc.de.
 
 		IN	MX	5 nomail.ccc.de.
 ;		IN	MX	10 local-mail.hamburg.ccc.de.