diff --git a/tasks/deb_pkgs.yml b/tasks/deb_pkgs.yml
index 9fcf240..bf1f72e 100644
--- a/tasks/deb_pkgs.yml
+++ b/tasks/deb_pkgs.yml
@@ -4,6 +4,9 @@
       #apt_key: keyserver={{ docker_repo_keyserver }} id={{ docker_repo_key }} state=present
       apt_key: url={{ docker_deb_repo_key_url }} state=present
 
+    - name: Remove the old docker packages, from the old distribution method
+      apt: pkg={{ docker_deb_old_packages }} state=absent
+
     - name: Remove the obsolete docker repository
       apt_repository: repo='{{ docker_deb_repo_old }}' state=absent update_cache=yes
 
diff --git a/vars/main.yml b/vars/main.yml
index deee5ee..4677d43 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -8,7 +8,7 @@ py3_env_pip_pkgs:
 docker_deb_repo_key_url: 'https://download.docker.com/linux/ubuntu/gpg'
 # Set to the Debian distribution name if not Ubuntu
 docker_linux_distribution: '{{ ansible_distribution_release | lower }}'
-docker_deb_repo_old: 'deb https://apt.dockerproject.org/repo {{ ansible_distribution | lower }}-{{ docker_distribution }} main'
+docker_deb_repo_old: 'deb https://apt.dockerproject.org/repo {{ ansible_distribution | lower }}-17 main'
 docker_deb_repo: 'deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable'
 
 docker_el_repo: 'https://download.docker.com/linux/centos/docker-ce.repo'
@@ -19,6 +19,12 @@ docker_deb_packages:
   - docker-ce-cli
   - containerd.io
 
+docker_deb_old_packages:
+  - docker-engine
+  - docker.io
+  - containerd
+  - runc
+
 docker_el_packages:
   - docker-ce
   - docker-ce-cli