diff --git a/inventories/chaosknoten/host_vars/auth-dns.yaml b/inventories/chaosknoten/host_vars/auth-dns.yaml
index 41b11ae..c94a9e7 100644
--- a/inventories/chaosknoten/host_vars/auth-dns.yaml
+++ b/inventories/chaosknoten/host_vars/auth-dns.yaml
@@ -19,34 +19,29 @@ knot__catalog_zones:
 knot__zones:
   - domain: "hh.ccc.de."
     catalog_member: "hamburg.ccc.de.catalog."
-    notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
+    notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone') }}"
 
   - domain: "ccchh.net."
     catalog_member: "hamburg.ccc.de.catalog."
-    notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
+    notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/ccchh.net.zone') }}"
 
   - domain: "hamburg.ccc.de."
     catalog_member: "hamburg.ccc.de.catalog."
-    notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
+    notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/hamburg.ccc.de.zone') }}"
 
   - domain: "eh20.easterhegg.eu."
     catalog_member: "hamburg.ccc.de.catalog."
-    notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
+    notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh20.easterhegg.eu.zone') }}"
 
   - domain: "eh22.easterhegg.eu."
     catalog_member: "hamburg.ccc.de.catalog."
-    notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
+    notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/eh22.easterhegg.eu.zone') }}"
 
-  - domain: "diday.org."
-    catalog_member: "hamburg.ccc.de.catalog."
-    notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
-    content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/diday.org.zone') }}"
-
   - domain: "3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa."
-    notify_targets: [ "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
+    notify_targets: [ "ns-intern.hamburg.ccc.de", "ns.vie.ccc.de", "ns2.vie.ccc.de" ]
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/auth-dns/zones/3.2.0.0.0.0.0.f.0.b.4.1.0.0.a.2.ip6.arpa.zone') }}"
diff --git a/resources/chaosknoten/auth-dns/zones/diday.org.zone b/resources/chaosknoten/auth-dns/zones/diday.org.zone
deleted file mode 100644
index 18e3efb..0000000
--- a/resources/chaosknoten/auth-dns/zones/diday.org.zone
+++ /dev/null
@@ -1,45 +0,0 @@
-$TTL 3600  ; 1 minutes
-@ SOA auth-dns.hamburg.ccc.de. noc.hamburg.ccc.de. (
-    1          ; serial (overwritten by knot automatically)
-    10800      ; refresh
-    3600       ; retry
-    3600000    ; expire
-    86400      ; minimum/negative ttl
-  )
-
-@ NS auth-dns.hamburg.ccc.de.
-@ NS ns.vie.ccc.de.
-
-
-
-;
-; Main Site
-;
-*.diday.org.                  A       212.12.48.125
-*.diday.org.                  AAAA    2a00:14b0:4200:3000:125::1
-diday.org.                    A       212.12.48.125
-diday.org.                    AAAA    2a00:14b0:4200:3000:125::1
-diday.org.                    TXT     "google-site-verification=pJq0LANnNJlkIflKgwbBOOt8GLuU5ywlW6RXhtPwdmE"
-
-;
-; Mail Setup
-;
-diday.org.                    MX      10 cow.hamburg.ccc.de.
-diday.org.                    TXT     "v=spf1 mx ip4:212.12.51.133 ip6:2a00:14b0:f000:23:51:133:0:1 ip4:212.12.48.122 ip6:2a00:14b0:4200:3000:122::1 -all"
-_dmarc.diday.org.             TXT     "v=DMARC1; p=none"
-dkim._domainkey.diday.org.    TXT     "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2YlBjR5oNm7eDeMXmQF6Izx1A17+vBHNapHlV2Rlj3N4Cjo9kSn0y8rlrqkASUKszDgToGrh1vkHhtYN6EE5QS5iVVSnXcWPiHnBzrxK4OmhVZZtrgGsM17pq9udAEEapc371dQQsL3WhXOvilGGSIQ9u5VDlc+y/ApXi79J6DHSf66t0JUU1e8vLn8ZI8hcXe3nsHXqbW4ot24rk8EvaugsK40jbhqxZ+BrJTBq/iP8w5RsF6KdYjTaqPfr/D4dbvUU6fc8jLyy3OWZgSkkOmv7m0UdbOm2Kk6c+1hNjQJZVEhQrpGrpAcjE37/v8ZNbQMgaasiugH6ElnKb13ZQIDAQAB
-"
-
-events.diday.org.     A       91.98.167.209
-events.diday.org.     AAAA    2a01:4f8:c2c:44b::1
-termine.diday.org.    CNAME   events.diday.org.
-
-
-;
-; Local Delegation or sub-sites
-;
-darmstadt.diday.org.    DS      60883 14 2 351d5314bd499060db6de802dc06104cc9ef54ce91c783def8d20e2e9cd99b99
-darmstadt.diday.org.    DS      60883 14 4 4dc93f94c226ecdbb0adbae32064c5ff9a52e9be80973a2ff99218e7bc5af19ab50d9f13f552f1a7900f781fbd7e8205
-darmstadt.diday.org.    NS      jerry.hax404.de.
-darmstadt.diday.org.    NS      summer.hax404.de.
-
diff --git a/roles/knot/templates/netplan-disable-ra.yaml b/roles/knot/templates/netplan-disable-ra.yaml
index bad31a5..505fba2 100644
--- a/roles/knot/templates/netplan-disable-ra.yaml
+++ b/roles/knot/templates/netplan-disable-ra.yaml
@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 network:
   ethernets:
-    {%- for i_iface_name in ansible_facts["interfaces"] -%}
+    {%- for i_iface_name in ansible_interfaces -%}
     {%- if i_iface_name != "lo" -%}
     {%- set i_iface = ansible_facts[i_iface_name] %}
 
@@ -11,3 +11,4 @@ network:
       accept-ra: false
     {% endif %}
     {% endfor %}
+