diff --git a/autostart/services/gpg-agent.service b/autostart/services/gpg-agent.service
index a75dfe2..b996209 100644
--- a/autostart/services/gpg-agent.service
+++ b/autostart/services/gpg-agent.service
@@ -1,7 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionPathExists=%h/.var/run/features/gpg_agent
+ConditionPathExists=%t/features/gpg_agent
 
 [Service]
 Type=forking
diff --git a/autostart/services/keepassx.service b/autostart/services/keepassx.service
index 37af746..b55e80d 100644
--- a/autostart/services/keepassx.service
+++ b/autostart/services/keepassx.service
@@ -1,7 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionPathExists=%h/.var/run/features/keepassx
+ConditionPathExists=%t/features/keepassx
 
 [Service]
 ExecStart=/usr/bin/env keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
diff --git a/autostart/services/laptop-lid.service b/autostart/services/laptop-lid.service
index 6a05e22..d899b39 100644
--- a/autostart/services/laptop-lid.service
+++ b/autostart/services/laptop-lid.service
@@ -1,7 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionPathExists=%h/.var/run/features/machine_is_laptop
+ConditionPathExists=%t/features/machine_is_laptop
 
 [Service]
 Type=oneshot
diff --git a/autostart/services/nextcloud.service b/autostart/services/nextcloud.service
index 4d88ebd..d99fbef 100644
--- a/autostart/services/nextcloud.service
+++ b/autostart/services/nextcloud.service
@@ -3,7 +3,7 @@ BindsTo=autostart.target
 After=windowmanager.target
 After=gnome-keyring.service
 
-ConditionPathExists=%h/.var/run/features/nextcloud
+ConditionPathExists=%t/features/nextcloud
 
 [Service]
 ExecStart=/usr/bin/env nextcloud --background
diff --git a/autostart/services/restic.service b/autostart/services/restic.service
index 76fbc1e..efad5ae 100644
--- a/autostart/services/restic.service
+++ b/autostart/services/restic.service
@@ -1,5 +1,5 @@
 [Unit]
-ConditionPathExists=%h/.var/run/features/restic_backup
+ConditionPathExists=%t/features/restic_backup
 
 [Service]
 Type=oneshot
diff --git a/autostart/services/steam.service b/autostart/services/steam.service
index dff023f..1840721 100644
--- a/autostart/services/steam.service
+++ b/autostart/services/steam.service
@@ -3,7 +3,7 @@ BindsTo=autostart.target
 After=windowmanager.target
 After=i3.service
 
-ConditionPathExists=%h/.var/run/features/steam
+ConditionPathExists=%t/features/steam
 
 [Service]
 ExecStart=/usr/bin/env steam
diff --git a/autostart/services/touchpad.service b/autostart/services/touchpad.service
index 4437dca..eeece09 100644
--- a/autostart/services/touchpad.service
+++ b/autostart/services/touchpad.service
@@ -1,7 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionPathExists=%h/.var/run/features/machine_is_laptop
+ConditionPathExists=%t/features/machine_is_laptop
 
 [Service]
 Type=oneshot
diff --git a/user.yml b/user.yml
index eaa35e1..6c41b58 100644
--- a/user.yml
+++ b/user.yml
@@ -246,7 +246,6 @@
       - ~/tmp
       - ~/.var/lib
       - ~/.var/log
-      - ~/.var/run
       - ~/.usr/lib
 
   - name: stat ~/bin
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index e16ebf1..a8a8855 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -20,7 +20,6 @@ export LESS="FRX"
 export WINEPATH="$HOME/games/wine"
 
 export LOGDIR="$HOME/.var/log"
-export RUNDIR="$HOME/.var/run"
 export LIBDIR="$HOME/.var/lib"
 export BINDIR="$HOME/bin"
 
@@ -53,7 +52,7 @@ umask 0022
 export {{ k }}="{{ v }}"
 {% endfor %}
 
-export FEATURE_DIR="${RUNDIR}/features/"
+export FEATURE_DIR="${XDG_RUNTIME_DIR}/features/"
 rm -rf "${FEATURE_DIR}"/
 mkdir -p "${FEATURE_DIR}"