diff --git a/roles/docker-cluster/tasks/install-docker-ce.yml b/roles/docker-cluster/tasks/install-docker-ce.yml
index 7df29e0..3dbd2c8 100644
--- a/roles/docker-cluster/tasks/install-docker-ce.yml
+++ b/roles/docker-cluster/tasks/install-docker-ce.yml
@@ -35,3 +35,15 @@
       name: "{{ansible_user_id}}"
       groups: docker
       append: yes
+
+  - name: start and enable docker
+    systemd:
+      name: docker
+      state: started
+      enabled: true
+
+  - name: add current user to docker group
+    user:
+      name: "{{ ansible_user_id }}"
+      append: yes
+      groups: docker
diff --git a/roles/docker-cluster/tasks/install-docker-io.yml b/roles/docker-cluster/tasks/install-docker-io.yml
index ef51958..d322d19 100644
--- a/roles/docker-cluster/tasks/install-docker-io.yml
+++ b/roles/docker-cluster/tasks/install-docker-io.yml
@@ -1,7 +1,20 @@
 ---
-- name: install needed packages
-  become: yes
-  apt:
-    update_cache: yes
-    pkg:
-      - docker.io
+- become: yes
+  block:
+  - name: install needed packages
+    apt:
+      update_cache: yes
+      pkg:
+        - docker.io
+
+  - name: start and enable docker
+    systemd:
+      name: docker
+      state: started
+      enabled: true
+
+  - name: add current user to docker group
+    user:
+      name: "{{ ansible_user_id }}"
+      append: yes
+      groups: docker