diff --git a/handlers/main.yml b/handlers/main.yml
index 93e6b22..54096d9 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -27,6 +27,7 @@
   listen:
     - "Restart aodh services"
     - "venv changed"
+    - "systemd service changed"
 
 - name: Start services
   service:
@@ -42,3 +43,4 @@
   listen:
     - "Restart aodh services"
     - "venv changed"
+    - "systemd service changed"
diff --git a/vars/main.yml b/vars/main.yml
index f98f260..04380a5 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -23,8 +23,8 @@ filtered_aodh_services: |-
   {%     set _ = value.update(
            {
              'service_key': key,
-             'enabled': 'yes',
-             'state': 'started',
+             'enabled': value['enabled'] | default(True),
+             'state': value['state'] | default('started'),
              'config_overrides': value.init_config_overrides
            }
          )