diff --git a/handlers/main.yml b/handlers/main.yml
index cdb8c9cb..5461c95f 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -20,3 +20,4 @@
   with_items: "{{ filtered_octavia_services }}"
   listen:
     - "venv changed"
+    - "systemd service changed"
diff --git a/vars/main.yml b/vars/main.yml
index cb840628..90a81921 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -29,7 +29,8 @@ filtered_octavia_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
            }
          )