diff --git a/.config/fish/user_variables.fish b/.config/fish/user_variables.fish
index b6d308ae..a97c0399 100644
--- a/.config/fish/user_variables.fish
+++ b/.config/fish/user_variables.fish
@@ -37,7 +37,6 @@ set -xg GTK2_RC_FILES $XDG_CONFIG_HOME/gtk-2.0/gtkrc
 set -xg W3M_DIR $XDG_DATA_HOME/w3m
 set -xg DOTNET_CLI_HOME $XDG_DATA_HOME/dotnet
 set -xg PNPM_HOME $XDG_DATA_HOME/pnpm
-set -xg GNUPGHOME $XDG_CONFIG_HOME/gnupg
 
 # Path
 fish_add_path $XDG_BIN_HOME
diff --git a/.config/gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
similarity index 61%
rename from .config/gnupg/gpg-agent.conf
rename to .gnupg/gpg-agent.conf
index 00015786..3e8ef2ac 100644
--- a/.config/gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -1,5 +1,9 @@
-enable-ssh-support
 default-cache-ttl 21600 # 6 hours
 max-cache-ttl 64800 # 18 hours
 
 pinentry-program /usr/bin/pinentry-gnome3
+
+# SSH
+enable-ssh-support
+default-cache-ttl-ssh 21600 # 6 hours
+max-cache-ttl-ssh 64800 # 18 hours