diff --git a/handlers/main.yml b/handlers/main.yml
index f90fb71..675018c 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -30,6 +30,7 @@
   listen:
     - "Restart gnocchi services"
     - "venv changed"
+    - "systemd service changed"
 
 # Note (odyssey4me):
 # The policy.json file is currently read continually by the services
@@ -68,3 +69,4 @@
   listen:
     - "Restart gnocchi services"
     - "venv changed"
+    - "systemd service changed"
diff --git a/vars/main.yml b/vars/main.yml
index b7f8316..478e649 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -51,8 +51,8 @@ filtered_gnocchi_services: |-
   {%     set _ = service.update(
            {
              'service_key': name,
-             'enabled': 'yes',
-             'state': 'started',
+             'enabled': service['enabled'] | default(True),
+             'state': service['state'] | default('started'),
              'config_overrides': service.init_config_overrides
            }
          )