diff --git a/30_knot_slave_setup.yaml b/30_knot_slave_setup.yaml
index ab044c0..76aa5c5 100644
--- a/30_knot_slave_setup.yaml
+++ b/30_knot_slave_setup.yaml
@@ -3,13 +3,12 @@
   hosts: slave_nameservers
   become: true
   vars:
-    identity: "{{ dns_nsid }}.m4n5.nl"
-    nsid: "{{ dns_nsid }}"
-    master_ip_acl: "86.94.191.237, 2a02:a442:ba11::1ebd, 2a02:a442:ba11::53"
+    master_ip_acl: "86.94.191.237, 2a02:a442:ba11::53"
     version: "off"
     knot_user: knot
     knot_group: knot
     catalog_domain: "catalog.internal."
+    identity: "{{ nsid }}.m4n5.nl"
 
   handlers:
     - name: "Reload knot service"
diff --git a/inventory.yaml b/inventory.yaml
index 4e2db82..196956a 100644
--- a/inventory.yaml
+++ b/inventory.yaml
@@ -8,38 +8,36 @@ all:
       ansible_ssh_port: 2222
       ssh_port: 2222
       ufw_status: enabled
-      dns_nsid: ns1
     srv01.nur.mziesel.nl:
       ansible_user: ansible
       ansible_python_interpreter: /usr/bin/python3
       ansible_ssh_private_key_file: ~/.ssh/ansible_id_ed25519
       ufw_status: disabled
       ssh_port: 22
-      dns_nsid: ns2
+    srv02.oci.mziesel.nl:
+      ansible_user: ansible
+      ansible_ssh_private_key_file: ~/.ssh/ansible_id_ed25519
+      ansible_python_interpreter: /usr/bin/python3
+      ufw_status: disabled
+      ssh_port: 22
     srv03.oci.mziesel.nl:
       ansible_user: ansible
       ansible_ssh_private_key_file: ~/.ssh/ansible_id_ed25519
       ansible_python_interpreter: /usr/bin/python3
       ufw_status: disabled
       ssh_port: 22
-      dns_nsid: ns3
-    # auth-dns-slave.internal.mziesel.nl:
-    #   ansible_host: 192.168.2.143
-    #   ansible_user: ansible
-    #   ansible_python_interpreter: /usr/bin/python3
-    #   ufw_status: enabled
-    #   ssh_port: 22
-    #   dns_nsid: ns4
   vars:
-    # nur01, oci03, internal-test
+    # nur01, oci03
     axfr_ips: "85.235.66.180, 2a03:4000:32:1ae:889d:dbff:fea1:9df7, 143.47.189.110, 2603:c022:c001:c601:7b56:9459:93ba:11b6"
 
   children:
     master_nameservers:
       hosts:
         pi5.internal.mziesel.nl:
+          nsid: ns1
     slave_nameservers:
       hosts:
         srv01.nur.mziesel.nl:
+          nsid: ns2
         srv03.oci.mziesel.nl:
-        # auth-dns-slave.internal.mziesel.nl:
+          nsid: ns3