diff --git a/group_vars/all.yml b/group_vars/all.yml
index ae55b49..1eb9c2a 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -9,4 +9,5 @@ keyring__keyserver: hkp://keyserver.ubuntu.com:80
 secret__levels: '.'
 
 site_name: '{{ initial_site_name | d(lxc_host) }}'
+home_user: '{{ (ansible_user != "root") | ternary(ansible_user, site_name) }}'
 ...
diff --git a/playbooks/own/yadm.yml b/playbooks/own/yadm.yml
index 7cd1c21..c47bae3 100644
--- a/playbooks/own/yadm.yml
+++ b/playbooks/own/yadm.yml
@@ -4,8 +4,11 @@
     - name: Clone dotfiles repo
       shell: yadm clone --bootstrap https://vcs.wpstudio.ru/gitea/dotfiles.git
 
+      # For manual change: sed -i 's/#/\\$/g' ${HOME}/.config/starship.toml
     - name: 'Change character for non-root user'
       become: false
       become_user: root
       shell: |
-        sed -i 's/#/\\$/g' /home/{{ ansible_user_id }}/.config/starship.toml
\ No newline at end of file
+          sed -i 's/#/\\$/g' /home/{{ home_user }}/.config/starship.toml
+      args:
+          executable: /bin/bash