diff --git a/handlers/main.yml b/handlers/main.yml
index e7065746..a7c9340f 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -12,19 +12,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-- name: Reload systemd daemon
-  command: "systemctl daemon-reload"
-  notify:
-    - Restart nova services
-
 - name: Restart libvirt-bin
-  service:
+  systemd:
     name: "{{ libvirt_service_name }}"
     state: "restarted"
+    daemon_reload: yes
 
 - name: Restart nova services
-  service:
+  systemd:
     name: "{{ item.value.service_name }}"
     state: "restarted"
   with_dict: "{{ nova_services }}"
diff --git a/tasks/nova_compute_kvm.yml b/tasks/nova_compute_kvm.yml
index 7a4f63ea..69181237 100644
--- a/tasks/nova_compute_kvm.yml
+++ b/tasks/nova_compute_kvm.yml
@@ -118,4 +118,4 @@
     - nova-config
     - nova-kvm
     - nova-libvirt
-    - nova-kvm-virsh-net
\ No newline at end of file
+    - nova-kvm-virsh-net
diff --git a/tasks/nova_init_systemd.yml b/tasks/nova_init_systemd.yml
index 0374e0ec..3ecd215f 100644
--- a/tasks/nova_init_systemd.yml
+++ b/tasks/nova_init_systemd.yml
@@ -63,4 +63,4 @@
   with_dict: "{{ nova_services }}"
   when: inventory_hostname in groups[item.value.group]
   notify:
-    - Reload systemd daemon
+    - Restart nova services