diff --git a/playbooks/basic-setup.yml b/playbooks/basic-setup.yml
index b1aefe4..2233749 100644
--- a/playbooks/basic-setup.yml
+++ b/playbooks/basic-setup.yml
@@ -7,13 +7,6 @@
       ansible.builtin.apt:
         update_cache: true
         upgrade: yes
-    - name: Install docker
-      ansible.builtin.apt:
-        name: "{{ item }}"
-        state: present
-      with_items:
-        - docker.io
-        - docker-compose
     - name: Install fish
       ansible.builtin.apt:
         name: "fish"
@@ -51,6 +44,23 @@
         url: "https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt"
         dest: "/etc/apt/sources.list.d/caddy-stable.list"
         mode: "u=rw,g=r,o=r"
+    - name: Add the docker GPG key
+      ansible.builtin.get_url:
+        url: "https://download.docker.com/linux/ubuntu/gpg"
+        dest: "/etc/apt/keyrings/docker.asc"
+        mode: "u=r,g=r,o=r"
+    - name: Add docker repository
+      ansible.builtin.copy:
+        dest: "/etc/apt/sources.list.d/docker.list"
+        content: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu jammy stable"
+    - name: Install docker
+      ansible.builtin.apt:
+        name: "{{ item }}"
+        state: present
+      with_items:
+        - docker-ce
+        - docker-ce-cli
+        - docker-compose-plugin
     - name: Install caddy
       ansible.builtin.apt:
         name: caddy