diff --git a/roles/mash/playbook_base/defaults/main.yml b/roles/mash/playbook_base/defaults/main.yml
index c3b33f1..b60fe9f 100644
--- a/roles/mash/playbook_base/defaults/main.yml
+++ b/roles/mash/playbook_base/defaults/main.yml
@@ -7,6 +7,8 @@ mash_playbook_identifier: mash
 mash_playbook_user_username: "{{ mash_playbook_identifier }}"
 mash_playbook_user_groupname: "{{ mash_playbook_identifier }}"
 
+mash_playbook_user_home: "{{ mash_playbook_base_path }}"
+
 # By default, the playbook creates the user (`mash_playbook_user_username`)
 # and group (`mash_playbook_user_groupname`) with a random id.
 # To use a specific user/group id, override these variables.
diff --git a/roles/mash/playbook_base/tasks/setup_user.yml b/roles/mash/playbook_base/tasks/setup_user.yml
index 9ec1790..55d50dd 100644
--- a/roles/mash/playbook_base/tasks/setup_user.yml
+++ b/roles/mash/playbook_base/tasks/setup_user.yml
@@ -15,7 +15,7 @@
         uid: "{{ omit if mash_playbook_uid is none else mash_playbook_uid }}"
         state: present
         group: "{{ mash_playbook_user_groupname }}"
-        home: "{{ mash_playbook_base_path }}"
+        home: "{{ mash_playbook_user_home }}"
         create_home: false
         system: true
       register: mash_base_user_result