diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml
index 9e678c771..f30d416f0 100644
--- a/roles/custom/matrix-base/defaults/main.yml
+++ b/roles/custom/matrix-base/defaults/main.yml
@@ -177,6 +177,8 @@ matrix_container_global_registry_prefix_override: ""
 
 matrix_user_name: "matrix"
 matrix_user_system: true
+matrix_user_shell: /sbin/nologin
+
 matrix_group_name: "matrix"
 matrix_group_system: true
 
diff --git a/roles/custom/matrix-base/tasks/setup_matrix_user.yml b/roles/custom/matrix-base/tasks/setup_matrix_user.yml
index a7a09f284..b2512a437 100644
--- a/roles/custom/matrix-base/tasks/setup_matrix_user.yml
+++ b/roles/custom/matrix-base/tasks/setup_matrix_user.yml
@@ -22,6 +22,7 @@
     home: "{{ matrix_base_data_path }}"
     create_home: false
     system: "{{ matrix_user_system }}"
+    shell: "{{ matrix_user_shell }}"
   register: matrix_user
 
 - name: Initialize matrix_user_uid and matrix_user_gid