diff --git a/playbooks/mail.archlinux.org.yml b/playbooks/mail.archlinux.org.yml
index 08ea63b0281bf08f0fb8cc68e475567b413896e9..b8e5e90f3d3a8101f1cf269b431d76597da35d42 100644
--- a/playbooks/mail.archlinux.org.yml
+++ b/playbooks/mail.archlinux.org.yml
@@ -14,7 +14,7 @@
     - { role: rspamd, rspamd_dkim_domain: archlinux.org, tags: ["mail"] }
     - { role: unbound, unbound_port: 5353, tags: ["mail"] }
     - { role: postfwd, tags: ['mail'] }
-    - { role: archusers, archusers_ssh_options: 'command="/usr/bin/passwd",restrict,pty' }
+    - { role: archusers, shell_override: '/bin/bash', archusers_ssh_options: 'command="/usr/bin/passwd",restrict,pty' }
     - { role: fail2ban }
     - { role: prometheus_exporters }
     - { role: promtail }
diff --git a/roles/archusers/tasks/main.yml b/roles/archusers/tasks/main.yml
index 595e2b2ec0023050271784e4e6332ee676fa9b5a..5c42f33452e94650c2e6c6dfc209afd809d1671e 100644
--- a/roles/archusers/tasks/main.yml
+++ b/roles/archusers/tasks/main.yml
@@ -15,7 +15,7 @@
     group: users
     groups: "{{ item.value.groups | join(',') }}"
     comment: "{{ item.value.name }}"
-    shell: "{{ item.value.shell | default('/bin/bash') }}"
+    shell: "{{ shell_override | default(item.value.shell | default('/bin/bash')) }}"
     password: ""
     update_password: on_create
     state: present