diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml
index 9679208aa..84b2707fb 100644
--- a/roles/custom/matrix-base/defaults/main.yml
+++ b/roles/custom/matrix-base/defaults/main.yml
@@ -177,6 +177,7 @@ matrix_container_global_registry_prefix_override: ""
 
 matrix_user_username: "matrix"
 matrix_user_groupname: "matrix"
+matrix_user_system: true
 
 # By default, the playbook creates the user (`matrix_user_username`)
 # and group (`matrix_user_groupname`) with a random ID.
diff --git a/roles/custom/matrix-base/tasks/setup_matrix_user.yml b/roles/custom/matrix-base/tasks/setup_matrix_user.yml
index 146452302..37f5cdb99 100644
--- a/roles/custom/matrix-base/tasks/setup_matrix_user.yml
+++ b/roles/custom/matrix-base/tasks/setup_matrix_user.yml
@@ -20,7 +20,7 @@
     group: "{{ matrix_user_groupname }}"
     home: "{{ matrix_base_data_path }}"
     create_home: false
-    system: true
+    system: "{{ matrix_user_system }}"
   register: matrix_user
 
 - name: Initialize matrix_user_uid and matrix_user_gid