diff --git a/handlers/main.yml b/handlers/main.yml
index b31fb1c..ff1bf72 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -25,6 +25,7 @@
   listen:
     - "Restart cloudkitty services"
     - "venv changed"
+    - "systemd service changed"
 
 - name: Start services
   systemd:
@@ -38,3 +39,4 @@
   listen:
     - "Restart cloudkitty services"
     - "venv changed"
+    - "systemd service changed"
diff --git a/tasks/main.yml b/tasks/main.yml
index f590ea9..ea224a1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -179,8 +179,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 }}"