diff --git a/.gpg-id b/.gpg-id
index f58ef68bb1..de868529e7 100644
--- a/.gpg-id
+++ b/.gpg-id
@@ -1,5 +1,5 @@
 1F32CF15F8B6FFCB151A280EE04AB29BBD7C2F3A
 4840B08578C8BAE610124B015E6B5D98656030F7
-F3D9ECE345C0B8251F0A9A5D8B7D3C2C0401B3E4
 7962A15E413AA789C5F2A9FAF0852CCFA49FD0A8
 369B1D24A0ACC03494863E98A2BF12B732AA88C6
+040158EA08028A3B0D83B56D6387ADBF36C0CD57
diff --git a/concourse/vars-files/gpg-keys.yml b/concourse/vars-files/gpg-keys.yml
index f4c2f560a4..5ff54e4265 100644
--- a/concourse/vars-files/gpg-keys.yml
+++ b/concourse/vars-files/gpg-keys.yml
@@ -62,49 +62,6 @@ gpg_public_keys:
 - |
   -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-  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
-  dXGBwA==
-  =Nxsx
-  -----END PGP PUBLIC KEY BLOCK-----
-- |
-  -----BEGIN PGP PUBLIC KEY BLOCK-----
-
   mDMEZkTI2BYJKwYBBAHaRw8BAQdAdsDXfVWTl28ItHdypgEBKJ6f9AKobgtkTnY6
   7A/qs560P0RvbWluaWMgR3JpZmZpbiA8ZG9taW5pYy5ncmlmZmluQGRpZ2l0YWwu
   Y2FiaW5ldC1vZmZpY2UuZ292LnVrPoiZBBMWCgBBFiEEeWKhXkE6p4nF8qn68IUs
@@ -170,3 +127,18 @@ gpg_public_keys:
   klXiOcNaFwXr/CnD4Lj2A+wga7829966MiakTWVRYV74N9/t/g==
   =5MHA
   -----END PGP PUBLIC KEY BLOCK-----
+- |
+  -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+  mDMEZuRUeBYJKwYBBAHaRw8BAQdAa8RpJ1wZ+mFztaKbW5ppuPcDhjZ4TbobMDA5
+  ViQeEDO0NU5haG9tIEFsZW0gPG5haG9tLmFsZW1AZGlnaXRhbC5jYWJpbmV0LW9m
+  ZmljZS5nb3YudWs+iJkEExYKAEEWIQQEAVjqCAKKOw2DtW1jh62/NsDNVwUCZuRU
+  eAIbAwUJBaOagAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBjh62/NsDN
+  V4ZjAP4hRloNlZLhFgUEzdC+KP8+OxOuP+OHz423ywBBViBV2gD/brGl5IT6hjyi
+  DrHwE3EL713tIaNhA61UiKH427RQnAq4OARm5FR4EgorBgEEAZdVAQUBAQdAmjhG
+  Ct3C9Wc2sP52qzNv2PSIr1wm3XqO9wCGY13mXAADAQgHiH4EGBYKACYWIQQEAVjq
+  CAKKOw2DtW1jh62/NsDNVwUCZuRUeAIbDAUJBaOagAAKCRBjh62/NsDNV9iqAP4y
+  7xxwjUMpvaNz0HQ9IFVHO7DNwgS1iHxCwyPaIiutWAEA2643ZK31xt/gXYhM3XP5
+  2uHdtjvIBvwQsz9bc1kZtQc=
+  =7FlG
+  -----END PGP PUBLIC KEY BLOCK-----