diff --git a/handlers/main.yml b/handlers/main.yml
index 3bd089e..a8b0b42 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -27,6 +27,7 @@
   listen:
     - "Restart mistral services"
     - "venv changed"
+    - "systemd service changed"
 
 - name: Start services
   service:
@@ -42,3 +43,4 @@
   listen:
     - "Restart mistral services"
     - "venv changed"
+    - "systemd service changed"
diff --git a/vars/main.yml b/vars/main.yml
index 914d49b..9ed5f4f 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -27,7 +27,13 @@ filtered_mistral_services: |-
           (('condition' not in value) or
            ('condition' in value and value['condition'])) and
            not ('wsgi_app' in value and value['wsgi_app']) %}
-  {%     set _ = value.update({'service_key': key}) %}
+  {%     set _ = value.update(
+            {
+              'service_key': key,
+              'enabled': value['enabled'] | default(True),
+              'state': value['state'] | default('started'),
+            }
+          ) %}
   {%     set _ = services.append(value) %}
   {%   endif %}
   {% endfor %}