diff --git a/documentation/static/pgpkeys/philip.key b/documentation/static/pgpkeys/philip.key
index e1c1902ce1..544f9295a3 100644
--- a/documentation/static/pgpkeys/philip.key
+++ b/documentation/static/pgpkeys/philip.key
@@ -1,139 +1,44 @@
-// sh addkey.sh philip BB6D8A14AFE7D96B 31AEB9B5FDBBCB0E ;
+// sh addkey.sh philip BB6D8A14AFE7D96B ;
 
 [.literal-block-margin]
 ....
-pub   rsa2048/31AEB9B5FDBBCB0E 2015-06-14 [SC] [expires: 2023-07-01]
-      Key fingerprint = 2CD1 92C2 6EE7 B7D1 F552  6619 31AE B9B5 FDBB CB0E
-uid                            Philip Paeps <philip@trouble.is>
-uid                            Philip Paeps <philip@freebsd.org>
-uid                            Philip Paeps <philip@nixsys.be>
-sub   rsa2048/7C62BC4776C9F29E 2015-06-14 [S] [expires: 2022-06-01]
-sub   rsa2048/935DB8343AF25C94 2015-06-14 [E] [expires: 2022-06-01]
-sub   rsa2048/CFF632544136DF54 2015-06-14 [A] [expires: 2022-06-01]
-
-pub   ed25519/BB6D8A14AFE7D96B 2021-05-25 [SC] [expires: 2023-07-01]
+pub   ed25519/BB6D8A14AFE7D96B 2021-05-25 [SC] [expires: 2024-07-01]
       Key fingerprint = B851 CD3A C248 F2ED 3E2C  C18C BB6D 8A14 AFE7 D96B
 uid                            Philip Paeps <philip@trouble.is>
 uid                            Philip Paeps <philip@freebsd.org>
-sub   ed25519/D92733BA06C579C2 2021-05-25 [S] [expires: 2022-07-01]
-sub   cv25519/235A60C6046F82F9 2021-05-25 [E] [expires: 2022-07-01]
-sub   ed25519/252E8C8E533D50C5 2021-05-25 [A] [expires: 2022-07-01]
+sub   ed25519/D92733BA06C579C2 2021-05-25 [S] [expires: 2023-07-01]
+sub   cv25519/235A60C6046F82F9 2021-05-25 [E] [expires: 2023-07-01]
+sub   ed25519/252E8C8E533D50C5 2021-05-25 [A] [expires: 2023-07-01]
 
 ....
 
 [.literal-block-margin]
 ....
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBFV941sBCACkoVSVhhY060ZrtaLWRpDGCtof7F1Kuot821zHCJmNXV8EKppV
-f8eMtwGz7TQj3WlWGpiN6RZQ6mdHq9sPXdPROO39017v3NxrPUMNJMeI0oewRSkH
-V2GxOjF2PrZA0QnzgwlSqG2dfdSrMl3cFTeoHPGKn1c1vsc381HY0LnQWxu2WBXH
-5iLvKPnSTpAzRoQjGazniLSH+BvmtmUkgI0BCV1184f1GWGaxe6OoXsgXzuKWTEv
-v/h1YRvNBa9taRFo3qg1TMJIJW9EGxulTdT4w5wrbLFkVIRDTE7X0PcDZnoNP8OC
-iu6taGhFBYxsqX/FwqULuV4S/9KGRss4PFuzABEBAAG0IFBoaWxpcCBQYWVwcyA8
-cGhpbGlwQHRyb3VibGUuaXM+iQGCBBMBCgBsKhpodHRwczovL3Ryb3VibGUuaXMv
-cGdwL3NpZ25pbmctcG9saWN5LmFzYwIbAwULCQgHAwUVCgkICwUWAwIBAAIeAQIX
-gAIZARYhBCzRksJu57fR9VJmGTGuubX9u8sOBQJglNiQBQkPIjHsAAoJEDGuubX9
-u8sOdD4IAJAB9v/l4LuuuyvmRKLOvdOjN/9+QwgkBS5NwiJTB9KtLPuqqrV+DKI3
-W274MNcDNq27ZeEEvux6wTlSdUEZhGTtAmAHjj1+gw25Ie9Jg1IvURAJw+r+cacu
-HNzF70X/gO6Vr/eRt3XF5ThIvO50gfsIHDynGGmIFfDoTTmGyQIzfSxVl02gbr1U
-zj/rHvAbfgEZuk2DIwXnMXQrymPG6RWUNzLMwQmHEqGmxjGJICAxrZsCwMKNVhiX
-yCLNLIUrxxq/wtgXuvFZQaHb5feegk4PeSn4aJzAKKh2jniZBeFP/RssCRyX7e66
-OoNCB2/jDNXpQ5aokw7tuhdwsRFgWoi0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQGZv
-c2RlbS5vcmc+iQFuBDABCgBYBQJWry7wKhpodHRwczovL3Ryb3VibGUuaXMvcGdw
-L3NpZ25pbmctcG9saWN5LmFzYyYdIEkgYW0gbm8gbG9uZ2VyIGludm9sdmVkIHdp
-dGggRk9TREVNLgAKCRAxrrm1/bvLDq/iB/sFJOV6UhPIBgSpau6PSFa5ey/xKew9
-xauifYaegPtbD7Ni+cJ2py9mz9oS1pI3nMTqCwYDUST9InI6Z+9kYVs/D27VW8qz
-Xkl7Ieq54VHBPEBs7/cuvp3bUkNiHg3ug9qBHgYpB+o7vc2qatM20QifpnPkzWN5
-j4tjU6EPYDk/kAGcXpeNNASn8Y+l7YXvIb2Wr2hHcGPGlMGvKC8AY/vwtzvm7qZ+
-cJJ+WfOydNwNnlRB3g+u9D+IefFsIoDCat3mZXm+2lAnHAiw7vzDKiZkl3y+Frpu
-2m6ovtZ2afTR73slF6jh94igsvtOIHzyQrab/ENF7GuVVI3zWIFHfxUqtCFQaGls
-aXAgUGFlcHMgPHBoaWxpcEBmcmVlYnNkLm9yZz6JAX8EEwEKAGkqGmh0dHBzOi8v
-dHJvdWJsZS5pcy9wZ3Avc2lnbmluZy1wb2xpY3kuYXNjAhsDBQsJCAcDBRUKCQgL
-BRYDAgEAAh4BAheAFiEELNGSwm7nt9H1UmYZMa65tf27yw4FAmCU2JcFCQ8iMewA
-CgkQMa65tf27yw5qQgf/Tqqde9qzAAinmLCdafBMzLwH7+er9oZ2xBkh5F2r8ZcA
-rS38GiOS3LMh/P1FVnH2aX2zYnp47aF0BND+buU8Qo1ZLhzLEi9MZpQdgDEH0FaZ
-cgGPY9IxsWk+iTxtX9cNFAzSTZs1hVHSvRfL1UYyXLDBqOIVMS4cda98WEHl810O
-T5rnbTmVV0fw8j0aZ1htlaKxoBqjd7aSi9hcI4BWOwPsQ88+l9nzCMjrv53TinWh
-TguAqSD+pJKF3ndoRuB8tZ6htlFxd0RoZBHbOnW5eusP6sr51ky4uRD6Cht5rnTB
-vtDRTDlTqEOlyN81nFx0UkGxomdwihYfi4KHlAdZN7QfUGhpbGlwIFBhZXBzIDxw
-aGlsaXBAbml4c3lzLmJlPokBfwQTAQoAaSoaaHR0cHM6Ly90cm91YmxlLmlzL3Bn
-cC9zaWduaW5nLXBvbGljeS5hc2MCGwMFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AW
-IQQs0ZLCbue30fVSZhkxrrm1/bvLDgUCYJTYlwUJDyIx7AAKCRAxrrm1/bvLDu6Q
-CACVkGmvlovr/LBXY5eNIlkVFisQWaQQ61Qy2I8UWvdzqmJw6KNEYrOVwsnr7lR8
-jjfJy645oLzCfnz3xtsaR24UTPqTy8C50koZMKEijJPz0ieTyFKDtQKDN9Iz5EjV
-ZouGeim6tmfdQ59g6vSls6GO95ysNQSfGyr3Hcc2Wwnhcw7ynq18bvWMDJ5Mxr4+
-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
-=xeRD
+mDMEYKyY8hYJKwYBBAHaRw8BAQdAIXiSTuKHgUIE2Zjco63bMMvb4pJ305MmoUyP
+uaiIqfS0IFBoaWxpcCBQYWVwcyA8cGhpbGlwQHRyb3VibGUuaXM+iJ0EExYKAEUC
+GwMFCwkIBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAhkBFiEEuFHNOsJI8u0+LMGM
+u22KFK/n2WsFAmJvkHcFCQXWAU4ACgkQu22KFK/n2WvFqQEAu2kViu2eEF2lzri3
+doEOpmnUWrS8Qy8eRgdYQzWfBnoBAOBXPmiPnSOUv+dxVVu0+T5YxFwq4a/Hu2OB
+a/rqHPoDtCFQaGlsaXAgUGFlcHMgPHBoaWxpcEBmcmVlYnNkLm9yZz6ImgQTFgoA
+QgIbAwULCQgHAgMiAgEGFQoJCAsCBBYCAwECHgcCF4AWIQS4Uc06wkjy7T4swYy7
+bYoUr+fZawUCYm+QhAUJBdYBTgAKCRC7bYoUr+fZa1wiAQCNVnLsfoEan63YOjAV
+HkqIpotxVOlGEsUTC/wQxX+cbAD/ZkuBCZwJs/7pUscP3jBkdoY5DvyQV5vYYcXw
+LJYWcAG4MwRgrJlsFgkrBgEEAdpHDwEBB0AjN6sanKZplYEZ1REyb02vMSIfg7Jh
+9uNF4i72RdAX94j1BBgWCgAmAhsCFiEEuFHNOsJI8u0+LMGMu22KFK/n2WsFAmJv
+kKQFCQPze9YAgXYgBBkWCgAdFiEEkJ1LuRY1fuOXdPQB2SczugbFecIFAmCsmWwA
+CgkQ2SczugbFecLiHQD+KWkaHCz15F2NKuhWVSDaW2EL2T8osDEBupPsxxpVI2wB
+AMwLYIjuMhF7W8nzU637j/ThD+DQKXkkWRu9gIKPkZYGCRC7bYoUr+fZa2ALAP94
+2/sq2+NEmgg52OnhryyyTotCdW6X30Nu0hsrOVxaEgEA1WpxQgUHhe2U2DfWhOz+
+LSvFx++uLXBbHg12LcUFwQm4OARgrJmDEgorBgEEAZdVAQUBAQdA43q+QOECkVQn
+PcmLuM1+ToWo4vVeU3K+yOjABDtsOxkDAQgHiH4EGBYKACYCGwwWIQS4Uc06wkjy
+7T4swYy7bYoUr+fZawUCYm+QswUJA/N7vwAKCRC7bYoUr+fZaw5sAQCC+hoi3Wn1
+MYdfiadgphIUMg2h60Bn4EKD+2axfeY8WgEAsSYmXbKHWL95Q5d6luFG937R+QS3
+uDZYcsbzGuVHAQK4MwRgrJmVFgkrBgEEAdpHDwEBB0BZL2Zkanycm9ZxXyblVkJY
+7uftl1+DtY4cCF/mP8K21Yh+BBgWCgAmAhsgFiEEuFHNOsJI8u0+LMGMu22KFK/n
+2WsFAmJvkMMFCQPze60ACgkQu22KFK/n2WsmhQEA3qZn7MtCwTIH9sGXRMVoyWbk
+q3ad71afC4pgpnP0PxUBAJ/882JTllFCsnIJtAoz+uxwrpjo/iImyIK/toioJh4B
+=GHHY
 -----END PGP PUBLIC KEY BLOCK-----
 ....