diff --git a/playbooks/knotd.yml b/playbooks/knotd.yml
index f5e6b0f..0992d7c 100755
--- a/playbooks/knotd.yml
+++ b/playbooks/knotd.yml
@@ -218,10 +218,6 @@
             target:
               - ns-1
               - ns-2
-          - name: isp
-            target:
-              - ns-1
-              - ns-2
           - name: adm
             target:
               - serge
@@ -343,57 +339,72 @@
           ec-2.ups:
             - 10.131.4.2
             - 2a09:6840:131::4:2
-          ldap-1.int:
-            - 10.128.0.10
-            - 2a09:6840:128::10
-          ntp-1.int:
-            - 10.128.0.203
-            - 2a09:6840:128::203
-          dns-1.int:
-            - 10.128.0.127
-            - 2a09:6840:128::127
-          isp-1.rtr:
-            - 10.128.0.255
-            - 2a09:6840:128::255
-          isp-2.rtr:
-            - 10.128.0.158
-            - 2a09:6840:128::158
+          network-1.pve:
+            - 10.128.5.1
+            - 2a09:6840:128::5:1
+          network-2.pve:
+            - 10.128.2.1
+            - 2a09:6840:128::2:1
           edge-1.rtr:
-            - 10.128.0.186
-            - 2a09:6840:128::186
+            - 10.128.10.2
+            - 2a09:6840:128::10:2
           edge-2.rtr:
-            - 10.128.0.228
-            - 2a09:6840:128::228
+            - 10.128.10.102
+            - 2a09:6840:128::10:102
+          dns-1.int:
+            - 10.128.10.3
+            - 2a09:6840:128::10:3
+          dns-2.int:
+            - 10.128.10.103
+            - 2a09:6840:128::10:103
+          ssh-1.mgmt:
+            - 10.128.10.1
+            - 2a09:6840:128::10:1
+          ssh-2.mgmt:
+            - 10.128.10.2
+            - 2a09:6840:128::10:2
           infra-1.rtr:
-            - 10.128.2.76
-            - 2a09:6840:128::2:76
+            - 10.128.10.4
+            - 2a09:6840:128::10:4
           infra-2.rtr:
-            - 10.128.2.27
-            - 2a09:6840:128::2:27
+            - 10.128.10.104
+            - 2a09:6840:128::10:104
+          isp-1.rtr:
+            - 10.128.10.5
+            - 2a09:6840:128::10:5
+          isp-2.rtr:
+            - 10.128.10.105
+            - 2a09:6840:128::10:105
+          dhcp-1.isp:
+            - 10.128.10.6
+            - 2a09:6840:128::10:6
+          dhcp-2.isp:
+            - 10.128.10.106
+            - 2a09:6840:128::10:106
           radius-1.isp:
-            - 10.128.0.208
-            - 2a09:6840:128::208
-      isp.auro.re:
-        dnssec_policy: infra
-        notify:
-          - xfr-ns-1
-          - xfr-ns-2
-        acl:
-          - xfr
-        #queryacl: local
-        soa:
-          mname: ns-master.int.auro.re.
-        ns:
-          - target:
-              - ns-1.auro.re.
-              - ns-2.auro.re.
-        hosts:
-          dhcp-1:
-            - 10.128.0.204
-            - 2a09:6840:128::204
-          dhcp-2:
-            - 10.128.0.91
-            - 2a09:6840:128::91
+            - 10.128.10.7
+            - 2a09:6840:128::10:7
+          radius-2.isp:
+            - 10.128.10.107
+            - 2a09:6840:128::10:107
+          ldap-1.int:
+            - 10.128.10.8
+            - 2a09:6840:128::10:8
+          ldap-2.int:
+            - 10.128.10.108
+            - 2a09:6840:128::10:108
+          ntp-1.int:
+            - 10.128.10.9
+            - 2a09:6840:128::10:9
+          ntp-2.int:
+            - 10.128.10.109
+            - 2a09:6840:128::10:109
+          prometheus-1.monit:
+            - 10.128.10.10
+            - 2a09:6840:128::10:10
+          prometheus-2.monit:
+            - 10.128.10.110
+            - 2a09:6840:128::10:110
       108.66.45.in-addr.arpa:
         dnssec_policy: ripe
         notify:
@@ -526,11 +537,6 @@
           - notify-master
         #queryacl: local
         master: xfr-master
-      isp.auro.re:
-        dnssec_validation: true
-        acl:
-          - notify-master
-        master: xfr-master
       108.66.45.in-addr.arpa:
         dnssec_validation: false
         acl: