diff --git a/tasks/docker.yml b/tasks/docker.yml
index 9e653b4..920d259 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -18,26 +18,13 @@
 
 - name: Add Docker apt key.
   apt_key:
-    url: https://download.docker.com/linux/ubuntu/gpg
+    url: curl -fsSL https://download.docker.com/linux/debian/gpg
     id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
     state: present
-    #   register: add_repository_key
-    # 
-    # - name: Ensure curl is present.
-    #   package: 
-    #     - name: curl
-    #     - state: present
-    #   when: add_repository_key is failed
-    # 
-    # - name: Add Docker apt key (alternative for older systems without SNI).
-    #   shell: "curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -"
-    #   args:
-    #     warn: no
-    #   when: add_repository_key is failed
 
 - name: Add Docker repository.
   apt_repository:
-    repo: deb https://apt.dockerproject.org/repo debian-stretch main
+    repo: deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable
     state: present
     update_cache: yes