diff --git a/tasks/common.yaml b/tasks/common.yaml
index 573d964..89e5fad 100644
--- a/tasks/common.yaml
+++ b/tasks/common.yaml
@@ -1,13 +1,5 @@
 ---
 
-# user setup
-- import_role:
-    name: root_user
-- import_role:
-    name: users
-- import_role:
-    name: fish
-
 # system setup
 - import_role:
     name: hostname
@@ -25,6 +17,8 @@
     name: keyboard_configuration
 
 # packages setup
+- import_role:
+    name: fish
 - import_role:
     name: debian_repos
 - import_role: