diff --git a/docker/tasks/main.yml b/docker/tasks/main.yml
index 0c970fb..bf3ee76 100644
--- a/docker/tasks/main.yml
+++ b/docker/tasks/main.yml
@@ -9,18 +9,45 @@
       name:
           - gpg
           - gpg-agent
+          - python3-debian
+  tags: docker_repo
+
+- name: Create apt keyrings directory
+  file:
+      path: /etc/apt/keyrings
+      state: directory
+      mode: "0755"
+  tags: docker_repo
 
 - name: Add docker-key
-  apt_key:
-      url: https://download.docker.com/linux/debian/gpg
-      state: present
+  get_url:
+      url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg"
+      dest: /etc/apt/keyrings/docker.asc
+      mode: "0644"
+  tags: docker_repo
+
+- name: Remove one-line docker-repository
+  file:
+      path: /etc/apt/sources.list.d/docker.list
+      state: absent
+  tags: docker_repo
 
 - name: Add docker-repository
-  apt_repository:
-      repo: "deb https://download.docker.com/linux/{{ ansible_facts.distribution | lower }} {{ ansible_facts.distribution_release }} stable"
-      state: present
-      filename: docker
+  deb822_repository:
+      name: docker
+      types: deb
+      uris: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}"
+      suites: "{{ ansible_facts.distribution_release }}"
+      components: stable
+      signed_by: /etc/apt/keyrings/docker.asc
+  register: docker_repo
+  tags: docker_repo
+
+- name: Update apt cache after docker-repository change
+  apt:
       update_cache: yes
+  when: docker_repo.changed
+  tags: docker_repo
 
 - name: Install docker
   package: