diff --git a/nas.yml b/nas.yml
index cc53eb1c..43d3e8a9 100644
--- a/nas.yml
+++ b/nas.yml
@@ -1,14 +1,15 @@
 ---
 - hosts: all
 
-  pre_tasks:
-    - import_tasks: tasks/users.yml
-      tags: users
-
   roles:
     ###
     ### Requirements
     ###
+    - role: ansible-nas-users
+      tags:
+        - ansible-nas-users
+        - ansible-nas
+
     - role: bertvv.samba
       tags:
         - samba
diff --git a/tasks/users.yml b/roles/ansible-nas-users/tasks/main.yml
similarity index 100%
rename from tasks/users.yml
rename to roles/ansible-nas-users/tasks/main.yml