diff --git a/playbooks/release/post.yaml b/playbooks/release/post.yaml
index 1e6409e20a..87f74fb639 100644
--- a/playbooks/release/post.yaml
+++ b/playbooks/release/post.yaml
@@ -1,3 +1,5 @@
 - hosts: all
   roles:
+    - remove-sshkey
     - remove-launchpad-credentials
+    - remove-gpgkey
diff --git a/playbooks/release/pre.yaml b/playbooks/release/pre.yaml
index c33c9eb54c..1779904990 100644
--- a/playbooks/release/pre.yaml
+++ b/playbooks/release/pre.yaml
@@ -15,3 +15,4 @@
     - legacy-copy-project-config-scripts
     - add-sshkey
     - add-launchpad-credentials
+    - add-gpgkey
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index b2b7302619..9bd84cfd97 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -631,6 +631,7 @@
         secret: lp_creds
       - name: ssh_key
         secret: release_ssh_key
+      - gpg_key
 
 - job:
     name: project-config-check-main-yaml