diff --git a/handlers/main.yml b/handlers/main.yml
index 2343e54f..d591025f 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -22,6 +22,7 @@
   with_items: "{{ filtered_swift_services }}"
   listen:
     - "venv changed"
+    - "systemd service changed"
 
 - name: Restart rsync service
   service:
diff --git a/vars/main.yml b/vars/main.yml
index 0b3dda17..b127cfcc 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -22,7 +22,14 @@ filtered_swift_services: |-
   {%   if (value['group'] in group_names) and
            (('service_en' not in value) or
             ('service_en' in value and value['service_en'])) %}
-  {%      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 %}