diff --git a/.gpg-id b/.gpg-id
index 2c77a0468..55af1e635 100644
--- a/.gpg-id
+++ b/.gpg-id
@@ -3,8 +3,6 @@ C02A4204A668EE926748DCB5206915775B184A4B
 0882371E530028DC42E890029F59DB7016136507
 E79E77C7B1920BF313DC4F880C56F1E6418404EE
 84DD200775BD023B3D3549CCA28C94F9E5BED1A0
-D91F2FCC6A511E49EC17B6D0BBBF9DFDC69C0FF5
-59A75AF2B504997A394C1F37C685939B1C7F7046
 59AE1B7EB2DE4D0CFE822BA7E28F86D679E5286B
 1F32CF15F8B6FFCB151A280EE04AB29BBD7C2F3A
 4840B08578C8BAE610124B015E6B5D98656030F7
diff --git a/concourse/vars-files/gpg-keys.yml b/concourse/vars-files/gpg-keys.yml
index b65452845..c80dbd8f6 100644
--- a/concourse/vars-files/gpg-keys.yml
+++ b/concourse/vars-files/gpg-keys.yml
@@ -106,39 +106,25 @@ gpg_public_keys:
   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
-  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
-  dAPt+HPu1bSiHanCtbLbfg==
-  =dfsC
+  ImzoxyR1wn2auQENBFzFkmIBCACsWGFRtCScCw2DoZG5whwqU0FDT5Qp1RO+JskI
+  sRefAGIc0YCLC4g2l1KLLsr7FRx5zpCBPhUPsAGdXFLVGghJyYMyBnBbcHeaghON
+  GDu4Q4sBr5GzzfcZd49vK8KhyW1ceyIU83tqU84MMRkVa4HFeIuP5psZzq+r5sgY
+  0QXWHs03DTpPgSznoFJ826FnuFuhI9rYjV1c3ihkztRYC3Y94iyiK/b/i3EEG6TA
+  jt7jwvllIvnZUw2K6SjUZG89YQ+Coytiz0RH4GJQrwaVEEW8XlQVrrIwzrBGqr8+
+  ynfmIJGk4HpF6987XIQ0BWGo+vgotsPY8uTBr4IKLQh6R/IxABEBAAGJAjYEGAEI
+  ACAWIQTAKkIEpmjukmdI3LUgaRV3WxhKSwUCXMWSYgIbDAAKCRAgaRV3WxhKS9nQ
+  D/kB/yY1it2eq9BNIPGWSHQDO2OyjY1QpN9MN7GLck4pha5gyiOUCpmDe51rzET5
+  x9HT329ss+KfFSjGloMLpe+ak7YL5LDS3VRcYMQtK31ouZnRgrjDPQJ14GK2PJDg
+  7nWG4RX7mUsRv0y+XVStlS6R1BiZ4dghGgBk7KbQCPU4qYBRvgDXGsoWlIlSKDwG
+  zJkirFDtmiJXZ781hTQ9fK2kRpOYUi+VSJayIQ+AJ2i2GXfG5SgzB3WdEk7CX6ts
+  JqoRXss8kkTvzw+ur5ihHDhvGyNE/ysbiH6gCPilmq3VdtPdK1ZnXwa5Oe2C27GT
+  xkDR2xRqd2PAHpmL3KoFWz35h1sjwSEuQO5+A3KMHF+QO1JujUhn4Mx18hq4VVGf
+  596EGjTLLO8ebgNGAFhPN7f0v3nGooYpfaBxc9NWXaS3oCJikTwLKOYDSsqr+r7/
+  B5cgjOwbdrXzVLXcuz71+uvYIbP+F2JzG0f/MSFwOYNvQOaXzi6ZgEPCXh1BDmcj
+  FtBZ7PWWbNjHKSGi1D989GW9DtCsnvyHM8Rp7RCuq5BAHEgu5QEO5VKSsYawODcJ
+  6aN505xeyD8XcIvTcLqVxG4iSw8h3vJvkzN4IyLevrszjuwXbzvzVkCsJI4IvnVQ
+  ZRObHt2uIwmL6V4SkSb52mtDdAPt+HPu1bSiHanCtbLbfg==
+  =6yZN
   -----END PGP PUBLIC KEY BLOCK-----
 - |
   -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -325,147 +311,6 @@ gpg_public_keys:
 - |
   -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-  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
-  =wYUR
-  -----END PGP PUBLIC KEY BLOCK-----
-- |
-  -----BEGIN PGP PUBLIC KEY BLOCK-----
-
-  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
-  =DF8u
-  -----END PGP PUBLIC KEY BLOCK-----
-- |
-  -----BEGIN PGP PUBLIC KEY BLOCK-----
-
   mQGNBGWmqIEBDAC/zMiAa4eDKf29cwuEIKLUc1yzP2Xvb0rTL471rBVl0YpsYo8X
   sOCJAHaG274u2Z1LMxvzHudAOjmXwaanrFmROkh+m3x9umu4lhNcmcct+XvxeuwL
   VEo97EQLZqIFazpJny/v5UK+06NmRqi1uBUZPlF+VdGGL+BAUhnkHZsSnGeqiKAV
diff --git a/manifests/concourse-manifest/github_auth/config.yml b/manifests/concourse-manifest/github_auth/config.yml
index f3cba1261..7d2951eb4 100644
--- a/manifests/concourse-manifest/github_auth/config.yml
+++ b/manifests/concourse-manifest/github_auth/config.yml
@@ -19,10 +19,8 @@ instance_groups:
                     users:
                     - corlettb
                     - dark5un
-                    - fearoffish
                     - kr8n3r
                     - jackjoy-gds
-                    - malcgds
                     - risicle
                     - DominicGriffin
                     - CorinWilkins
diff --git a/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml b/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml
index d5a14fa7e..5e501c32f 100644
--- a/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml
+++ b/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml
@@ -16,11 +16,9 @@ instance_groups:
                     users:
                     - kr8n3r
                     - risicle
-                    - malcgds
                     - jackjoy-gds
                     - dark5un
                     - corlettb
-                    - fearoffish
                     - DominicGriffin
                     - CorinWilkins
                     - monotypical