diff --git a/config.yaml b/config.yaml
index 15de07f4..316f56d2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -162,6 +162,13 @@ dotfiles:
   f_foot.ini:
     src: .config/foot/foot.ini
     dst: ~/.config/foot/foot.ini
+  f_gpg-agent.conf:
+    src: .gnupg/gpg-agent.conf
+    dst: ~/.gnupg/gpg-agent.conf
+    chmod: '600'
+  f_gpg.conf:
+    src: .gnupg/gpg.conf
+    dst: ~/.gnupg/gpg.conf
 profiles:
   base:
     dotfiles:
@@ -233,6 +240,8 @@ profiles:
     - f_user-dirs.dirs
     - f_gitconfig
     - f_foot.ini
+    - f_gpg-agent.conf
+    - f_gpg.conf
   Moria:
     include:
     - terminal
diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf
new file mode 100644
index 00000000..a2009825
--- /dev/null
+++ b/home/.gnupg/gpg-agent.conf
@@ -0,0 +1,5 @@
+enable-ssh-support
+pinentry-program /usr/bin/pinentry-gnome3
+default-cache-ttl 60
+max-cache-ttl 120
+extra-socket /run/user/1000/gnupg/S.gpg-agent.extra
diff --git a/home/.gnupg/gpg.conf b/home/.gnupg/gpg.conf
index 50a0191b..0a9596e7 100644
--- a/home/.gnupg/gpg.conf
+++ b/home/.gnupg/gpg.conf
@@ -1,17 +1,2 @@
-# File re-created by pEp
-# See backup in '/home/reekymarko/.gnupg/gpg.conf.1.pep.bkp'
-
-# File re-created by pEp
-# See backup in '/home/reekymarko/.gnupg/gpg.conf.0.pep.bkp'
-
-# GnuPG config file created by KGpg
-
-default-key  A90767494C36DEC2EBBCFB8E83850D9D26A2216C
-keyserver hkp://keys.gnupg.net
-cert-digest-algo SHA256
-no-emit-version 
-no-comments 
-personal-cipher-preferences AES AES256 AES192 CAST5
-personal-digest-preferences SHA256 SHA512 SHA384 SHA224
-ignore-time-conflict 
-allow-freeform-uid 
+use-agent
+keyserver hkps://keys.openpgp.org