diff --git a/roles/common/files/resolv.conf b/roles/common/files/resolv.conf
deleted file mode 100644
index 863bc57..0000000
--- a/roles/common/files/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-nameserver 192.168.30.1
-nameserver 1.1.1.1
-nameserver 1.0.0.1
-search lan
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 4639a90..7577a2a 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -9,16 +9,6 @@
   file:
     path: "{{ base_service_dir }}"
     state: directory
-- name: Disable systemd-resolved
-  systemd:
-    name: systemd-resolved
-    enabled: false
-    state: stopped
-- name: Copy resolv.conf
-  copy:
-    src: "{{ role_path }}/files/resolv.conf"
-    dest: /etc/resolv.conf
-    follow: true
 - name: Add dataserver to known hosts
   known_hosts:
     name: "lewis.lan"
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 3acc420..639834f 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -8,11 +8,12 @@
       - python3-pip
 - name: Add Docker APT key
   apt_key:
-    url: https://download.docker.com/linux/ubuntu/gpg
-    keyring: /etc/apt/keyrings/docker.gpg
+    url: https://download.docker.com/linux/debian/gpg
+    state: present
 - name: Add Docker repository
   apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
+    repo: "deb https://download.docker.com/linux/debian bullseye stable"
+    state: present
   register: apt_repository
 - name: Update APT cache
   apt:
@@ -30,6 +31,10 @@
     name:
       - docker
       - docker-compose
+- name: Create /etc/docker directory
+  file:
+    path: "/etc/docker"
+    state: directory
 - name: Copy daemon.json
   copy:
     src: "{{ role_path }}/files/daemon.json"