diff --git a/.config/setup/04-install-sway-session.sh b/.config/setup/04-install-sway-session.sh
index a4992ac..e1f16a8 100755
--- a/.config/setup/04-install-sway-session.sh
+++ b/.config/setup/04-install-sway-session.sh
@@ -1,3 +1,3 @@
 #! /usr/bin/sh
 
-sudo cp "${HOME}"/.config/setup/sway.desktop /usr/share/wayland-sessions/
+sudo cp "$(systemd-path user-configuration)"/setup/sway.desktop /usr/share/wayland-sessions/
diff --git a/.config/setup/05-install-tor.sh b/.config/setup/05-install-tor.sh
index bd148bf..5668455 100755
--- a/.config/setup/05-install-tor.sh
+++ b/.config/setup/05-install-tor.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/sh
 
-sudo cp "${HOME}"/.config/setup/sources.list.d/tor.sources /etc/apt/sources.list.d/
+sudo cp "$(systemd-path user-configuration)"/setup/sources.list.d/tor.sources /etc/apt/sources.list.d/
 sudo chmod 644 /etc/apt/sources.list.d/tor.sources
 
 outfile=/usr/share/keyrings/deb.torproject.org-keyring.gpg
diff --git a/.config/setup/23-install-emacs-lilypond-mode.sh b/.config/setup/23-install-emacs-lilypond-mode.sh
index 980326d..97855fd 100755
--- a/.config/setup/23-install-emacs-lilypond-mode.sh
+++ b/.config/setup/23-install-emacs-lilypond-mode.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/sh
 
-projdir="${HOME}/Projects"
+projdir="$(systemd-path user)"/Projects
 mkdir -p "${projdir}"
 rm -rf "${projdir}/lilypond"
 cd "${projdir}" || exit
diff --git a/.local/bin/vaulter b/.local/bin/vaulter
index 58b6bb1..f3f17b9 100755
--- a/.local/bin/vaulter
+++ b/.local/bin/vaulter
@@ -5,8 +5,8 @@ podman --transient-store run --rm -ti \
     --env XDG_RUNTIME_DIR=/tmp \
     --hostname localhost \
     --mount type=bind,source="${XDG_RUNTIME_DIR}"/"${WAYLAND_DISPLAY}",target=/tmp/"${WAYLAND_DISPLAY}" \
-    --mount type=bind,readonly=true,source="${HOME}"/.keys/vaults,target=/root/.age/key \
-    --mount type=bind,readonly=true,source="${HOME}"/.keys/vaults.pub,target=/root/.age/key.pub \
-    --mount type=bind,source="${HOME}"/Vaults,target=/root/Vaults \
+    --mount type=bind,readonly=true,source="$(systemd-path user)"/.keys/vaults,target=/root/.age/key \
+    --mount type=bind,readonly=true,source="$(systemd-path user)"/.keys/vaults.pub,target=/root/.age/key.pub \
+    --mount type=bind,source="$(systemd-path user)"/Vaults,target=/root/Vaults \
     --network none \
     vaulter:latest