diff --git a/handlers/main.yml b/handlers/main.yml
index 85085d22..ca3b9129 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -27,6 +27,7 @@
   listen:
     - "Restart glance services"
     - "venv changed"
+    - "systemd service changed"
 
 - name: Start services
   service:
@@ -42,3 +43,4 @@
   listen:
     - "Restart glance services"
     - "venv changed"
+    - "systemd service changed"
diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index f2a6a445..c468401c 100644
--- a/tasks/glance_install.yml
+++ b/tasks/glance_install.yml
@@ -152,8 +152,8 @@
     systemd_TasksAccounting: true
     systemd_services:
       - service_name: "{{ service_var.service_name }}"
-        enabled: yes
-        state: started
+        enabled: "{{ service_var.enabled | default(True) }}"
+        state: "{{ service_var.state | default('started') }}"
         execstarts: "{{ service_var.execstarts }}"
         execreloads: "{{ service_var.execreloads | default([]) }}"
         config_overrides: "{{ service_var.init_config_overrides }}"