diff --git a/docs/otp.md b/docs/otp.md
index d77a70d5bd788048d7bc9293a4fd09be58c10424..0d9632d8f027049d6158d10e0c47bd9a8fcdc6f2 100644
--- a/docs/otp.md
+++ b/docs/otp.md
@@ -56,7 +56,7 @@ Run
 
     pass otp insert -i rsync.net -a archlinux Rsync.net/archlinux-master-token -s
 
-When asked for a secret, provide the `2FA token seed` from `group_vars/all/vault_rsync.net.yml`.
+When asked for a secret, provide the `2FA token seed` from `host_vars/localhost/vault_rsync.net.yml`.
 You can then run
 
     pass otp code Rsync.net/archlinux-master-token
diff --git a/group_vars/all/vault_hetzner_storagebox.yml b/host_vars/localhost/vault_hetzner_storagebox.yml
similarity index 100%
rename from group_vars/all/vault_hetzner_storagebox.yml
rename to host_vars/localhost/vault_hetzner_storagebox.yml
diff --git a/group_vars/all/vault_hetzner_webservice.yml b/host_vars/localhost/vault_hetzner_webservice.yml
similarity index 100%
rename from group_vars/all/vault_hetzner_webservice.yml
rename to host_vars/localhost/vault_hetzner_webservice.yml
diff --git a/group_vars/all/vault_rsync.net.yml b/host_vars/localhost/vault_rsync.net.yml
similarity index 100%
rename from group_vars/all/vault_rsync.net.yml
rename to host_vars/localhost/vault_rsync.net.yml
diff --git a/roles/borg_client/defaults/main.yml b/roles/borg_client/defaults/main.yml
index b4b29e40f8a6a497b5ffcf9bb517bde7b5eff8a6..d08c91f8d2a56d44cff155ec4bbbcc5b3cba6218 100644
--- a/roles/borg_client/defaults/main.yml
+++ b/roles/borg_client/defaults/main.yml
@@ -4,7 +4,7 @@ backup_hosts:
     dir: "~/repo"
     suffix: ""
     borg_cmd: "borg"
-  - host: "ssh://{{ rsync_net_username }}@zh1905.rsync.net:22"
+  - host: "ssh://zh1905@zh1905.rsync.net:22"
     dir: "~/backup/{{ inventory_hostname }}"
     suffix: "-offsite"
     borg_cmd: "borg --remote-path=borg1"