diff --git a/defaults/main.yml b/defaults/main.yml
index f51b734..09aafe9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,7 +9,7 @@ weechat:
   # user to install and use weechat
   user: "{{ ansible_user_id }}"
   # where is our home direcotory for weechat
-  home_directory: "/home/{{ weechat_user }}/.weechat"
+  home_directory: "{{ ansible_env.HOME | default(/home/{{ weechat.user }}) }}/.weechat"
   # plugins we want
   plugins: []
   # weechat gpg key for debian/ubuntu repo
diff --git a/vars/main.yml b/vars/main.yml
index 6452013..3b6e237 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -9,7 +9,7 @@ weechat_plugin_languages:
   lua: lua
 
 # version management
-playbook_version_number: 2051 # should be over ninethousand
+playbook_version_number: 2052 # should be over ninethousand
 playbook_version_path: 'role-weechat_roles-ansible_github.com.version'
 
 # default values
@@ -18,6 +18,6 @@ _weechat:
   autostart: true
   configure: false
   user: "{{ ansible_user_id }}"
-  home_directory: "/home/{{ weechat_user }}/.weechat"
+  home_directory: "{{ ansible_env.HOME | default(/home/{{ weechat.user }}) }}/.weechat"
   plugins: []
   gpg_id: '11E9DE8848F2B65222AA75B8D1820DB22A11534E'