diff --git a/handlers/main.yml b/handlers/main.yml
index e281e3bd..c37716cc 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -70,6 +70,7 @@
     - "Restart nova services"
     - "venv changed"
     - "cert installed"
+    - "systemd service changed"
 
 - name: Start services
   service:
@@ -86,3 +87,4 @@
     - "Restart nova services"
     - "venv changed"
     - "cert installed"
+    - "systemd service changed"
diff --git a/vars/main.yml b/vars/main.yml
index 0775b353..7ec1ded0 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -41,7 +41,14 @@ filtered_nova_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 %}