diff --git a/tasks/main.yml b/tasks/main.yml
index a3a69d2d..e3948780 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -227,14 +227,6 @@
   tags:
     - keystone-config
 
-- import_tasks: keystone_federation_sp_idp_setup.yml
-  when:
-    - keystone_service_setup | bool
-    - keystone_sp != {}
-  run_once: yes
-  tags:
-    - keystone-config
-
 - name: Flush handlers
   meta: flush_handlers
 
diff --git a/tasks/main_keystone_federation_sp_idp_setup.yml b/tasks/main_keystone_federation_sp_idp_setup.yml
new file mode 100644
index 00000000..3aa346a7
--- /dev/null
+++ b/tasks/main_keystone_federation_sp_idp_setup.yml
@@ -0,0 +1,7 @@
+- import_tasks: keystone_federation_sp_idp_setup.yml
+  when:
+    - keystone_service_setup | bool
+    - keystone_sp != {}
+  run_once: yes
+  tags:
+    - keystone-config