diff --git a/d4s_user_services_perms/tasks/main.yml b/d4s_user_services_perms/tasks/main.yml
index 1dde899e..de7de2da 100644
--- a/d4s_user_services_perms/tasks/main.yml
+++ b/d4s_user_services_perms/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
+- include: d4s-basic-node.yml
+  when: gcore_node or d4s_additional_users
 - include: d4s-smartgears-node.yml
   when: smartgears_node
 - include: d4s-tomcat-node.yml
   when: d4s_tomcat_node
 - include: d4s-service-node.yml
   when: d4s_service_node
-- include: d4s-basic-node.yml
-  when: gcore_node or d4s_additional_users
 - include: users-data-dirs.yml
   when: d4s_users_data_directories is defined
 - include: security_limits.yml