diff --git a/handlers/main.yml b/handlers/main.yml
index e7481e1e..8c0f7348 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -30,6 +30,7 @@
   listen:
     - "Restart ceilometer services"
     - "venv changed"
+    - "systemd service changed"
 
 - name: Start services
   service:
@@ -48,3 +49,4 @@
   listen:
     - "Restart ceilometer services"
     - "venv changed"
+    - "systemd service changed"
diff --git a/tasks/main.yml b/tasks/main.yml
index b34ff754..7446a78b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -80,7 +80,12 @@
       {% set services = [] %}
       {% for service in ceilometer_services.values() %}
       {%   if service.group | intersect(group_names) %}
-      {%     set _ = service.update({'enabled': 'yes', 'state': 'started'}) %}
+      {%     set _ = service.update(
+                {
+                  'enabled': value['enabled'] | default(True),
+                  'state': value['state'] | default('started')
+                }
+              ) %}
       {%     set _ = service.pop('group') %}
       {%     set _ = services.append(service) %}
       {%   endif %}