diff --git a/handlers/main.yml b/handlers/main.yml
index 44d4d41c..9cfd70d2 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -22,6 +22,7 @@
   with_list: "{{ filtered_ironic_services }}"
   listen:
     - "venv changed"
+    - "systemd service changed"
 
 - name: Restart tftpd
   service:
diff --git a/vars/main.yml b/vars/main.yml
index a98f332d..42a8bde5 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -254,8 +254,8 @@ filtered_ironic_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
            }
          )