diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
new file mode 100644
index 0000000..d61c92f
--- /dev/null
+++ b/roles/docker/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+- name: "Reload systemd"
+  systemd:
+    daemon_reload: yes
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index d10c372..dab6afe 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -18,6 +18,15 @@
     path: /tmp/docker-install.sh
     state: absent
 
+# Fix Docker bug: add containerd as pre-requisite for Docker service, see: https://github.com/docker/for-linux/issues/421
+- name: Start Docker after containerd
+  lineinfile:
+    dest: /lib/systemd/system/docker.service
+    regexp: "^After="
+    line: "After=network-online.target firewalld.service containerd.service"
+  notify: Reload systemd
+  become: true
+
 - name: Set Docker to auto-start
   service:
     name: docker