diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 38aac73..cd27361 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -23,18 +23,7 @@
   - import_tasks: system_setup/openssh.yml
   - import_tasks: system_setup/scripts.yml
 
-  # Make sure users exist on the system
-  - import_tasks: users/root.yml
-  - import_tasks: users/rene.yml
-  - import_tasks: users/ansible.yml
-
-  - name: users | all | repeating tasks for all users
-    include_tasks: users/all.yml
-    loop:
-      - rene
-      - root
-    loop_control:
-      loop_var: user
+  - import_tasks: users.yml
 
   # Set up the ansible environment
   # - import_tasks: ansible_setup.yml
diff --git a/roles/base/tasks/users.yml b/roles/base/tasks/users.yml
new file mode 100644
index 0000000..06e7772
--- /dev/null
+++ b/roles/base/tasks/users.yml
@@ -0,0 +1,12 @@
+# Make sure users exist on the system
+- import_tasks: users/root.yml
+- import_tasks: users/rene.yml
+- import_tasks: users/ansible.yml
+
+- name: users | all | repeating tasks for all users
+  include_tasks: users/all.yml
+  loop:
+    - rene
+    - root
+  loop_control:
+    loop_var: user
\ No newline at end of file
diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml
index 2e9f70e..bab0cdc 100644
--- a/roles/server/tasks/main.yml
+++ b/roles/server/tasks/main.yml
@@ -10,4 +10,8 @@
   - include_tasks: utilities/snmpd.yml
   - include_tasks: utilities/wireguard.yml
 
+  - include_role:
+    name: base
+    tasks_from: users
+
 # vim: ts=2 sw=2