diff --git a/handlers/main.yml b/handlers/main.yml
index 8e3b427d..eb2784a0 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -13,15 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Reload systemd daemon
-  command: "systemctl daemon-reload"
-  notify:
-    - Restart ceilometer services
-
 - name: Restart ceilometer services
-  service:
+  systemd:
     name: "{{ item.0.service_name }}"
     state: "restarted"
+    daemon_reload: yes
   with_subelements:
     - "{{ ceilometer_services }}"
     - group
diff --git a/tasks/ceilometer_init_systemd.yml b/tasks/ceilometer_init_systemd.yml
index 2acdfb7e..9f892214 100644
--- a/tasks/ceilometer_init_systemd.yml
+++ b/tasks/ceilometer_init_systemd.yml
@@ -73,4 +73,4 @@
     - group
   when: inventory_hostname in groups[item.1]
   notify:
-    - Reload systemd daemon
+    - Restart ceilometer services