diff --git a/roles/dotfiles/files/fish/config.fish b/roles/dotfiles/files/fish/config.fish
index 11cdc01..011c67e 100644
--- a/roles/dotfiles/files/fish/config.fish
+++ b/roles/dotfiles/files/fish/config.fish
@@ -7,4 +7,4 @@ if status --is-login
   end
 end
 
-eval (keychain --eval --agents ssh --quick)
+eval (keychain --eval --agents ssh --agents gpg 82CD152AAAE9CAF77EACB29E73F092605AF3286C)
diff --git a/roles/dotfiles/files/gpg-agent.conf b/roles/dotfiles/files/gpg-agent.conf
new file mode 100644
index 0000000..0ffbdb7
--- /dev/null
+++ b/roles/dotfiles/files/gpg-agent.conf
@@ -0,0 +1,2 @@
+default-cache-ttl 10800
+maximum-cache-ttl 10800
diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index bcd2b8a..419c7d5 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -55,6 +55,7 @@
     - '{{home}}/.config/i3status/config'
     - '{{home}}/.config/rofi/config'
     - '{{home}}/.gitconfig'
+    - '{{home}}/.gnupg/gpg-agent.conf'
 
 - name: Make sure folders exist
   file:
@@ -66,6 +67,7 @@
     - '{{home}}/.config/rofi/'
     - '{{home}}/.ssh/'
     - '{{home}}/pictures/shots/'
+    - '{{home}}/.gnupg/'
 
 - name: Link files
   file:
@@ -92,3 +94,5 @@
       dest: '{{home}}/pictures/wallpaper'
     - src: '{{files_dir}}/gitconfig'
       dest: '{{home}}/.gitconfig'
+    - src: '{{files_dir}}/gpg-agent.conf'
+      dest: '{{home}}/.gnupg/gpg-agent.conf'