diff --git a/handlers/main.yml b/handlers/main.yml
index d57445e..2022ccd 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -26,6 +26,7 @@
   listen:
     - "Restart designate services"
     - "venv changed"
+    - "systemd service changed"
 
 - name: Perform Designate pools update
   command: "{{ designate_bin }}/designate-manage pool update --file /etc/designate/pools.yaml"
@@ -46,3 +47,4 @@
   listen:
     - "Restart designate services"
     - "venv changed"
+    - "systemd service changed"
diff --git a/vars/main.yml b/vars/main.yml
index cc9372b..d4d5f58 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -29,7 +29,8 @@ filtered_designate_services: |-
   {%     set _ = value.update(
            {
              'service_key': key,
-             'enabled': 'yes',
+             'enabled': value['enabled'] | default(True),
+             'state': value['state'] | default('started'),
              'config_overrides': value.init_config_overrides
            }
          )