diff --git a/data/Dockerfiles/unbound/docker-entrypoint.sh b/data/Dockerfiles/unbound/docker-entrypoint.sh
index 6a705764..b458cd8a 100755
--- a/data/Dockerfiles/unbound/docker-entrypoint.sh
+++ b/data/Dockerfiles/unbound/docker-entrypoint.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-unbound-control-setup
 echo "Receiving anchor key..."
 /usr/sbin/unbound-anchor -a /etc/unbound/trusted-key.key
 echo "Receiving root hints..."
diff --git a/data/Dockerfiles/unbound/unbound.conf b/data/Dockerfiles/unbound/unbound.conf
index 7efa8ad6..42202bc5 100644
--- a/data/Dockerfiles/unbound/unbound.conf
+++ b/data/Dockerfiles/unbound/unbound.conf
@@ -25,9 +25,3 @@ server:
 	qname-minimisation: yes
 	minimal-responses: yes
 	num-threads: 3
-remote-control:
-	control-enable: yes
-	server-key-file: /etc/unbound/unbound_server.key
-	server-cert-file: /etc/unbound/unbound_server.pem
-	control-key-file: /etc/unbound/unbound_control.key
-	control-cert-file: /etc/unbound/unbound_control.pem
diff --git a/data/conf/bind9/named.conf b/data/conf/bind9/named.conf
deleted file mode 100644
index ea2cfb09..00000000
--- a/data/conf/bind9/named.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-acl internal_networks {
-        127.0.0.0/8;
-        192.168.0.0/16;
-        172.16.0.0/12;
-        10.0.0.0/8;
-        fd4d:6169:6c63:6f77::/64;
-};
-
-options {
-        directory "/var/bind";
-        allow-recursion { internal_networks; };
-        listen-on { any; };
-        listen-on-v6 { any; };
-        pid-file "/var/run/named/named.pid";
-        allow-transfer { none; };
-        dnssec-enable yes;
-        dnssec-validation yes;
-        dnssec-lookaside auto;
-};
-
-include "/etc/bind/bind.keys";
diff --git a/docker-compose.yml b/docker-compose.yml
index 90733df6..4864f40e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
 
     unbound-mailcow:
       image: mailcow/unbound
+      build: ./data/Dockerfiles/unbound
       command: /usr/sbin/unbound
       depends_on:
         mysql-mailcow: