diff --git a/inventories/chaosknoten/host_vars/auth-dns.yaml b/inventories/chaosknoten/host_vars/auth-dns.yaml
index 25b3de1..155db2c 100644
--- a/inventories/chaosknoten/host_vars/auth-dns.yaml
+++ b/inventories/chaosknoten/host_vars/auth-dns.yaml
@@ -1,2 +1,8 @@
 ---
 deploy_systemd_resolved_config__enable: false
+
+docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/auth-dns/docker_compose/compose.yaml.j2') }}"
+
+docker_compose__configuration_files:
+  - name: "knot.conf"
+    content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/auth-dns/docker_compose/knot.conf.j2') }}"
diff --git a/inventories/chaosknoten/hosts.yaml b/inventories/chaosknoten/hosts.yaml
index a6cea9b..5d97783 100644
--- a/inventories/chaosknoten/hosts.yaml
+++ b/inventories/chaosknoten/hosts.yaml
@@ -155,6 +155,7 @@ docker_compose_hosts:
     sunders:
     spaceapiccc:
     mjolnir:
+    auth-dns:
 nextcloud_hosts:
   hosts:
     cloud:
diff --git a/playbooks/deploy.yaml b/playbooks/deploy.yaml
index 130d914..e032782 100644
--- a/playbooks/deploy.yaml
+++ b/playbooks/deploy.yaml
@@ -101,8 +101,3 @@
 
 - name: Run ensure_eh22_styleguide_dir Playbook
   ansible.builtin.import_playbook: ensure_eh22_styleguide_dir.yaml
-
-- name: Setup authoritative dns servers
-  hosts: auth-dns
-  roles:
-    - auth-dns
diff --git a/roles/auth-dns/templates/knot.conf.j2 b/resources/chaosknoten/auth-dns/docker_compose/knot.conf.j2
similarity index 89%
rename from roles/auth-dns/templates/knot.conf.j2
rename to resources/chaosknoten/auth-dns/docker_compose/knot.conf.j2
index d0e5a5a..17f6144 100644
--- a/roles/auth-dns/templates/knot.conf.j2
+++ b/resources/chaosknoten/auth-dns/docker_compose/knot.conf.j2
@@ -2,17 +2,17 @@
 # See knot.conf(5) or refer to the server documentation.
 
 server:
-    rundir: "/run/knot"
+    rundir: "/rundir"
     user: knot:knot
     automatic-acl: on
-    listen: [ "0.0.0.0@53", "::@53" ]
+    listen: [ "212.12.48.124", "2a00:14b0:4200:3000:124::1" ]
 
 log:
-  - target: syslog
+  - target: stderr
     any: info
 
 database:
-    storage: "/var/lib/knot"
+    storage: "/storage"
 
 key:
   - id: auth-dns.hamburg.ccc.de
@@ -41,7 +41,7 @@ policy:
 # define default settings that apply to all zones
 template:
   - id: default
-    storage: "/etc/knot/zones"
+    storage: "/config/zones"
     file: "%s.zone"
     semantic-checks: on
     zonefile-sync: -1
diff --git a/roles/auth-dns/handlers/main.yaml b/roles/auth-dns/handlers/main.yaml
deleted file mode 100644
index 5ee0a5d..0000000
--- a/roles/auth-dns/handlers/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- tags: [ 02-auth-dns ]
-  name: restart knot
-  become: true
-  notify: restart knot
-  ansible.builtin.systemd:
-    name: knot.service
-    state: restarted
-
diff --git a/roles/auth-dns/tasks/01-install.yaml b/roles/auth-dns/tasks/01-install.yaml
deleted file mode 100644
index e3a66e3..0000000
--- a/roles/auth-dns/tasks/01-install.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- tags: [ auth-dns ]
-  name: Install knot
-  become: true
-  package:
-    name: [ knot, knot-exporter ]
-
diff --git a/roles/auth-dns/tasks/02-configure.yaml b/roles/auth-dns/tasks/02-configure.yaml
deleted file mode 100644
index 6577a79..0000000
--- a/roles/auth-dns/tasks/02-configure.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- tags: [ auth-dns ]
-  name: Deploy knot configuration file
-  become: true
-  notify: restart knot
-  template:
-    src: knot.conf.j2
-    dest: /etc/knot/knot.conf
-    owner: knot
-    group: knot
-    mode: u=rw,g=r,o=
-
diff --git a/roles/auth-dns/tasks/main.yaml b/roles/auth-dns/tasks/main.yaml
deleted file mode 100644
index 8bf981f..0000000
--- a/roles/auth-dns/tasks/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- import_tasks: 01-install.yaml
-- import_tasks: 02-configure.yaml