diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index 4153d123d382e65b7a297b83ee05bc9c356a9a3e..79db42f9219a8c563d4499f47a53b6d139ed4d9b 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -2,14 +2,14 @@
 - name: restart docker
   command: /bin/true
   notify:
-    - reload systemd
-    - reload docker
+    - Docker | reload systemd
+    - Docker | reload docker
 
-- name : reload systemd
+- name : Docker | reload systemd
   shell: systemctl daemon-reload
   when: ansible_service_mgr == "systemd"
 
-- name: reload docker
+- name: Docker | reload docker
   service:
     name: docker
     state: restarted
diff --git a/roles/etcd/handlers/main.yml b/roles/etcd/handlers/main.yml
index bb32d4e8eb6acf1ddf20101463b60737b015d97b..693754a06364419e0f6750fbb83c6affdd4969fb 100644
--- a/roles/etcd/handlers/main.yml
+++ b/roles/etcd/handlers/main.yml
@@ -2,18 +2,18 @@
 - name: restart etcd
   command: /bin/true
   notify:
-    - reload systemd
+    - etcd | reload systemd
     - reload etcd
     - wait for etcd up
 
 - name: restart etcd-proxy
   command: /bin/true
   notify:
-    - reload systemd
+    - etcd | reload systemd
     - reload etcd-proxy
     - wait for etcd up
 
-- name: reload systemd
+- name: etcd | reload systemd
   command: systemctl daemon-reload
   when: ansible_service_mgr == "systemd"
 
diff --git a/roles/etcd/templates/etcd-docker.service.j2 b/roles/etcd/templates/etcd-docker.service.j2
index e196c0b594fe1ba5cc558d42bab250c7613e7f03..a37759fecd75ced245caa360bb1d39c98135c92c 100644
--- a/roles/etcd/templates/etcd-docker.service.j2
+++ b/roles/etcd/templates/etcd-docker.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=etcd docker wrapper
-Wants=docker.service
+Wants=docker.socket
 After=docker.service
 
 [Service]
diff --git a/roles/etcd/templates/etcd-proxy-docker.service.j2 b/roles/etcd/templates/etcd-proxy-docker.service.j2
index 98d548ccee96eaec1bab9d21efaddd121164bc2c..bf70f0e7fb7d1c12b625047816c472134780b47e 100644
--- a/roles/etcd/templates/etcd-proxy-docker.service.j2
+++ b/roles/etcd/templates/etcd-proxy-docker.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=etcd-proxy docker wrapper
-Wants=docker.service
+Wants=docker.socket
 After=docker.service
 
 [Service]
diff --git a/roles/kubernetes/node/handlers/main.yml b/roles/kubernetes/node/handlers/main.yml
index 6be44279d95f3b6f4307a5e0513c0c6b02acf64c..5991bebf324c5673e76e0c394059db3d536a1ee3 100644
--- a/roles/kubernetes/node/handlers/main.yml
+++ b/roles/kubernetes/node/handlers/main.yml
@@ -2,14 +2,14 @@
 - name: restart kubelet
   command: /bin/true
   notify:
-    - reload systemd
-    - reload kubelet
+    - Kubelet | reload systemd
+    - Kubelet | reload kubelet
 
-- name: reload systemd
+- name: Kubelet | reload systemd
   command: systemctl daemon-reload
   when: ansible_service_mgr == "systemd"
 
-- name: reload kubelet
+- name: Kubelet | reload kubelet
   service:
     name: kubelet
     state: restarted
diff --git a/roles/network_plugin/calico/handlers/main.yml b/roles/network_plugin/calico/handlers/main.yml
index 1e8d56dbe61f6d7868d5865d71063066d59c5b3b..d4059c412adcecd1e22b1879a9ff5ad0a9c8b501 100644
--- a/roles/network_plugin/calico/handlers/main.yml
+++ b/roles/network_plugin/calico/handlers/main.yml
@@ -2,15 +2,15 @@
 - name: restart calico-node
   command: /bin/true
   notify:
-    - reload systemd
-    - reload calico-node
+    - Calico | reload systemd
+    - Calico | reload calico-node
 
-- name : reload systemd
+- name : Calico | reload systemd
   shell: systemctl daemon-reload
   when: ansible_service_mgr == "systemd"
 
-- name: reload calico-node
+- name: Calico | reload calico-node
   service:
     name: calico-node
     state: restarted
-    sleep: 10
\ No newline at end of file
+    sleep: 10
diff --git a/roles/network_plugin/calico/templates/calico-node.service.j2 b/roles/network_plugin/calico/templates/calico-node.service.j2
index 191ae8f40c7a7767c6e620571673cfc8e54947bd..115da35aec13ed4f1d38d21058ba79204b4acd92 100644
--- a/roles/network_plugin/calico/templates/calico-node.service.j2
+++ b/roles/network_plugin/calico/templates/calico-node.service.j2
@@ -1,8 +1,8 @@
 [Unit]
 Description=Calico per-node agent
 Documentation=https://github.com/projectcalico/calico-docker
-Wants=docker.service etcd-proxy.service
 After=docker.service etcd-proxy.service
+Wants=docker.socket
 
 [Service]
 User=root
diff --git a/roles/network_plugin/flannel/handlers/main.yml b/roles/network_plugin/flannel/handlers/main.yml
index cb3986312b5dd4786e2825edb5550120bc926c50..1982765d4ae723ea2ae692d58cbb2ef433de3d97 100644
--- a/roles/network_plugin/flannel/handlers/main.yml
+++ b/roles/network_plugin/flannel/handlers/main.yml
@@ -7,20 +7,20 @@
 - name: restart docker
   command: /bin/true
   notify:
-    - reload systemd
-    - reload docker
-    - reload kubelet
+    - Flannel | reload systemd
+    - Flannel | reload docker
+    - Flannel | reload kubelet
 
-- name : reload systemd
+- name : Flannel | reload systemd
   shell: systemctl daemon-reload
   when: ansible_service_mgr == "systemd"
 
-- name: reload docker
+- name: Flannel | reload docker
   service:
     name: docker
     state: restarted
 
-- name: reload kubelet
+- name: Flannel | reload kubelet
   service:
     name: kubelet
     state: restarted
diff --git a/roles/network_plugin/weave/handlers/main.yml b/roles/network_plugin/weave/handlers/main.yml
index 3bb21c346ec86454083b0cb69543de323cb66d44..bd20781ee6a6381da20c3a7d9b3c3747e16e67db 100644
--- a/roles/network_plugin/weave/handlers/main.yml
+++ b/roles/network_plugin/weave/handlers/main.yml
@@ -2,32 +2,32 @@
 - name: restart docker
   command: /bin/true
   notify:
-    - reload systemd
-    - reload docker
+    - Weave | reload systemd
+    - Weave | reload docker
 
-- name : reload systemd
+- name : Weave | reload systemd
   shell: systemctl daemon-reload
   when: ansible_service_mgr == "systemd"
 
 - name: restart weave
   command: /bin/true
   notify:
-    - reload systemd
+    - Weave | reload systemd
     - reload weave
 
 - name: restart weaveproxy
   command: /bin/true
   notify:
-    - reload systemd
+    - Weave | reload systemd
     - reload weaveproxy
 
 - name: restart weaveexpose
   command: /bin/true
   notify:
-    - reload systemd
+    - Weave | reload systemd
     - reload weaveexpose
 
-- name: reload docker
+- name: Weave | reload docker
   service:
     name: docker
     state: restarted