diff --git a/tasks/main.yml b/tasks/main.yml
index 9df7bec9..706f8106 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -87,6 +87,19 @@
   tags:
     - swift-config
 
+- include_tasks: swift_key_setup.yml
+  when:
+    - "swift_do_sync | bool"
+  tags:
+    - swift-config
+
+- include_tasks: swift_rings.yml
+  when:
+    - "swift_do_sync | bool"
+  tags:
+    - swift-config
+    - swift-rings
+
 - name: Run the systemd service role
   include_role:
     name: systemd_service
@@ -138,18 +151,5 @@
   tags:
     - swift-config
 
-- include_tasks: swift_key_setup.yml
-  when:
-    - "swift_do_sync | bool"
-  tags:
-    - swift-config
-
-- include_tasks: swift_rings.yml
-  when:
-    - "swift_do_sync | bool"
-  tags:
-    - swift-config
-    - swift-rings
-
 - name: Flush handlers
   meta: flush_handlers