diff --git a/tasks/main.yml b/tasks/main.yml
index 706f8106..07ce46de 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -114,16 +114,22 @@
     systemd_BlockIOAccounting: true
     systemd_MemoryAccounting: true
     systemd_TasksAccounting: true
-    systemd_services:
-      - service_name: "{{ service_var.service_name }}"
-        enabled: yes
-        state: started
-        execstarts: "{{ service_var.execstarts }}"
-        execreloads: "{{ service_var.execreloads | default([]) }}"
-        config_overrides: "{{ swift_service_defaults | combine(service_var.init_config_overrides) }}"
-  with_items: "{{ filtered_swift_services }}"
-  loop_control:
-    loop_var: service_var
+    systemd_services: |-
+      {% set services = [] %}
+      {% for service in filtered_swift_services %}
+      {%
+        set _ = service.update(
+          {
+            'enabled': 'yes',
+            'state': 'started',
+            'config_overrides': swift_service_defaults | combine(service.init_config_overrides)
+          }
+        )
+      %}
+      {%   set _ = service.pop('init_config_overrides') -%}
+      {%   set _ = services.append(service) -%}
+      {% endfor %}
+      {{ services }}
   tags:
     - swift-config
     - systemd-service