diff --git a/roles/fedora_setup/files/gnupg/gpg-agent.conf b/roles/fedora_setup/files/gnupg/gpg-agent.conf
new file mode 100644
index 0000000..8cd69f4
--- /dev/null
+++ b/roles/fedora_setup/files/gnupg/gpg-agent.conf
@@ -0,0 +1,3 @@
+pinentry-program /usr/bin/pinentry
+default-cache-ttl 7200
+max-cache-ttl 7200
diff --git a/roles/fedora_setup/tasks/main.yml b/roles/fedora_setup/tasks/main.yml
index 1b79db0..084517c 100755
--- a/roles/fedora_setup/tasks/main.yml
+++ b/roles/fedora_setup/tasks/main.yml
@@ -158,3 +158,11 @@
     mode: '0644'
     directory_mode: '0755'
   tags: fonts
+
+- name: Configure gpg-agent
+  copy:
+    src: gnupg
+    dest: "{{ lookup('env', 'HOME') }}/.gnupg"
+    mode: '0644'
+    directory_mode: '0700'
+  tags: gpg
diff --git a/roles/fedora_setup/vars/main.yml b/roles/fedora_setup/vars/main.yml
index c3ac1ac..1d33783 100755
--- a/roles/fedora_setup/vars/main.yml
+++ b/roles/fedora_setup/vars/main.yml
@@ -33,6 +33,7 @@ packages:
   - keychain
   - tldr
   - gnupg2
+  - pinentry
   - trash-cli
   - htop
   - mpv