diff --git a/handlers/main.yml b/handlers/main.yml
index e2c74b0..2a1d256 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,12 +1,7 @@
 ---
-- name: reload unit
-  become: true
-  systemd:
-    daemon_reload: yes
-  when:
-    - ansible_service_mgr == "systemd"
-
 - name: restart docker
-  service:
+  become: yes
+  systemd:
     name: docker
     state: restarted
+    daemon_reload: yes
diff --git a/tasks/main.yml b/tasks/main.yml
index 300f091..2a8c4c7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -48,19 +48,11 @@
     src: docker.j2.service
     dest: /usr/lib/systemd/system/docker.service
   notify:
-    - reload unit
     - restart docker
 
 - meta: flush_handlers
 
 - name: ensure starts on system boot
-  service:
+  systemd:
     name: docker
     enabled: yes
-
-- name: ensure vagrant user can run docker commands
-  user:
-    name: vagrant
-    groups: docker
-    append: yes
-  when: vagrant