diff --git a/autostart/services/gpg-agent.service b/autostart/services/gpg-agent.service
index 7423f02..a75dfe2 100644
--- a/autostart/services/gpg-agent.service
+++ b/autostart/services/gpg-agent.service
@@ -5,6 +5,7 @@ ConditionPathExists=%h/.var/run/features/gpg_agent
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/env gpg-agent --homedir %h/.gnupg --no-detach --daemon
-PassEnvironment=DISPLAY
+ExecStart=/usr/bin/env gpg-agent --no-detach --daemon
+PassEnvironment=DISPLAY GNUPGHOME
+
 Restart=always
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index b92d0a0..31e4aac 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -42,6 +42,8 @@ export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
 
+export GNUPGHOME="$HOME/.gnupg"
+
 umask 0022
 
 {% set env = machine.environment | combine(user.environment) %}