diff --git a/data/key-cert/PGPKEY-A85BAADA b/data/key-cert/PGPKEY-A85BAADA
new file mode 100644
index 000000000..115b38ebf
--- /dev/null
+++ b/data/key-cert/PGPKEY-A85BAADA
@@ -0,0 +1,74 @@
+key-cert:           PGPKEY-A85BAADA
+method:             PGP
+fingerpr:           67BE E563 43B6 420D 550E  DF2A 6D61 7FD0 A85B AADA
+owner:              Moritz 'e1mo' Fromm <hello@e1mo.de>
+certif:             -----BEGIN PGP PUBLIC KEY BLOCK-----
+certif:             
+certif:             mDMEX0oysxYJKwYBBAHaRw8BAQdA5GCdqkxlMBjCPfYVjKH6Zb5pFSEHW5pMAVf0
+certif:             CNidDaS0I01vcml0eiAnZTFtbycgRnJvbW0gPGhlbGxvQGUxbW8uZGU+iJEEExYK
+certif:             ADkCGwEECwkIBwQVCgkIBRYCAwEAAh4BAheAFiEEZ77lY0O2Qg1VDt8qbWF/0Khb
+certif:             qtoFAl9KM9sCGQEACgkQbWF/0Khbqtpk+AEA/mITYu72kjTZ+o7GvRWpwBxROA6n
+certif:             PfQVektNdN+hAEcBALV5WUajs4fuumaKIUCQosbB7EFPZHWa3XD23oqYCacPiQIz
+certif:             BBABCgAdFiEELVU3v5mecsP+1RgNtXkrTdMvZbcFAl9KMyUACgkQtXkrTdMvZbfs
+certif:             fA/+PM5f75P/nDj72NkSXD0/axjCXcsRFYTHie33+6eFnqgdY3XNddn34jyDLmyO
+certif:             mQhouGo8bxBiTrRkSmxDKMn8bGLrwNHwZOCH7eipqRGHKjQxZ/bjRmDEPxobQ/Nz
+certif:             dwm9OBgP+aJeyTTLRjtTML2lUqfKXrgtWmXVPaJ1tqAojs4h1uC8fWNOCOVuYiz4
+certif:             rKigQfoRaz7xO66BQ/y03pxeZ6llINYU7Cql75sKgvKNTmgdhvnPfveZn/qhicAh
+certif:             Th+V9XUlqHFtsHifHFQ6X8hbNatQ9HQ0FvgxmPkYVVTK4ccVNQhIP6Y6QvgvpkXQ
+certif:             KyiDYH5aOGHLM/8pQhlYUFqMGRAlr3F3i+cL84KiNdhPoTJ5ZFu4zX/6IiZuzNVt
+certif:             TZZdT+0vWerOgM8NooeLbjtxzl8MGcjTlBWbJ8op8/IlR1KPR6SHG0OeCBlaqjLR
+certif:             DBsAXteHQTNGWkjmXCHKGVvEUp7HCtNEenWAHFWK27tDcF1JCNLqeEjhwPlmNKgO
+certif:             7zlUWiPesLHvAkVXOO8R7zI9/Blz3rPM8G0hdwNbOHzMSbDuOKeBnBMwGbBbZDtW
+certif:             4rC8x8j9mgGKExzFFD+xaiTxXXwEptXetRYfMpxzdAx5tiAeO2UdHrMawF4jFeba
+certif:             ownrta0ZAyhmScVH/b6rSvBHM2pgaTizWHgjiTvOPIjStZG0IU1vcml0eiAnZTFt
+certif:             bycgRnJvbW0gPGdpdEBlMW1vLmRlPoiOBBMWCgA2AhsBBAsJCAcEFQoJCAUWAgMB
+certif:             AAIeAQIXgBYhBGe+5WNDtkINVQ7fKm1hf9CoW6raBQJfSjPbAAoJEG1hf9CoW6ra
+certif:             jzkA/03g/YB5o3Zn56ADm4HOU2lsEIjcL6I66q3tx2Hjg2iNAP9bwv9eH1VADdzS
+certif:             +NOQLvM02NQrccM7lp9riiWfg8BBDIkCMwQQAQoAHRYhBC1VN7+ZnnLD/tUYDbV5
+certif:             K03TL2W3BQJfSjMlAAoJELV5K03TL2W3VsEP/A6XxgydhCc0gDC3B13L7OsxMMhw
+certif:             /ky7Bhv0c4t4y1CkD4GK7kEVP1e5NuOy8/ayDFD9mnfi76ilEP7FKz6wvG/fdY2B
+certif:             mah2aFxTqK5b0SDfSbYYD1S64XYW0h4yX6o42Ei9cetYZrk032ngNNnJNXqoVtRX
+certif:             MY6AU+tZfkJNzAi4BfDS2rpB08VGLmEK0yprtEhOXly5lL96YbLAlSa6B0BgSB1B
+certif:             ZzjiPdyNpNYFE0b5iYNKnihGylV2dghtIcErn70Zmv7UipFXZnfY7OPo9R7WncuS
+certif:             jnuadskYiCCGapdrUwXh/vCiGVkALRTAY3GdfSHliPmk6L2zltK+vHnALtNmYBiw
+certif:             e7GT8dV3JwGSIbpy6c40kOadMB7+9GvvHos2ct1svDfWV8TYEBk/cAQ/GF5tIjoA
+certif:             tMoALhvLo2YLQMSmjZ9SK+727NACnsqVtJ2+OBAX7YR6esRGtW2YtHBHdAM4khQx
+certif:             j5KHw7uZKMfrMkrFIZ6ORnxHxbWWW/ZknckH3DzYmtuOaJ0ZUy1U0980qu0vm1d2
+certif:             R6jMn44xVHdMD6cNQv6VXVJIBy8H6UFwhONMDrRUzfQfTN75K3Tt8NVZGDsGF4XE
+certif:             b0Scs9iHYD93JDB4+dQy9yIASXC+jazEjWVu9ofHBmRhJ+nurH192f7mbvqN4B4S
+certif:             rS2t6FLWQRxqVjimtCNNb3JpdHogJ2UxbW8nIEZyb21tIDxsaXN0c0BlMW1vLmRl
+certif:             PoiOBBMWCgA2FiEEZ77lY0O2Qg1VDt8qbWF/0KhbqtoFAl9KMuACGwEECwkIBwQV
+certif:             CgkIBRYCAwEAAh4BAheAAAoJEG1hf9CoW6raHqkA/iZvLIh342utrHBm2lJpg2xn
+certif:             9Sl6msnnjr99hiC6Lv3pAP9uyCtye8TB74MXKNAW48wRkzjoEu6ob5Ju8KfX/UOn
+certif:             AIkCMwQQAQoAHRYhBC1VN7+ZnnLD/tUYDbV5K03TL2W3BQJfSjMhAAoJELV5K03T
+certif:             L2W347AP/iKxFMdxmCCosyELSpyiT/W6NMfgsw3++AL/sTZ1E+nBuog6AA72Tuu/
+certif:             Cc0WlXrODd9dV6sAvHFkOkfzbXvwGY0UwfwGGd3/e5Wh/mVb9jG3gLzCKXzKQyOj
+certif:             zTtITrqHhCy4bNn0M/+14ozIkfVCmLdh6uJxHjUhSPP75NZnnKYmn/v4rtZrjAop
+certif:             g4T7Pyk4xgiKVGkpxijUOqlq17j8Y+9j8OuUi0fhABsSpkDmgEs6aFORMqq9aYbQ
+certif:             sixqCdr8AyHJkeTcK4+QTQMAsZNqWH77i2QfkcXLCdl1b355Xn0VNQNcSpgMjlWy
+certif:             0RrOLhWCjjCU4faaIboXJRTTRsYzcm4S4rFmtC+1EuMZSTW8KdCStU6Gq9Gf+qs7
+certif:             Zo2W1G6BQL8aKFGABFGFdS/NrwDajLUxLlmA2A4xgf2i080q3YznOnIK+hRtCXEp
+certif:             uEGK8TbqRzNIHGSZT3DX/BdSt5oX3ReIOK4N2v2BK5UrU511WRVaZNLV1guKC1Ug
+certif:             5hTah/IJytpLR+KSy/l1YxTyDM7UOlk/DuogUQDJYkmUYbi9QviL1+1M1HTEheNI
+certif:             0urh9aE6AQCZ00//kWk44BRfqiKSuCQglCeim9j+4U0uX0Yy0b8e01S6AhPmcVTW
+certif:             wTi/c1ZyhYPvbY4LWlIlK1kp+NeFhAeAnxwpXjhlsEwIBizRkuKOuDMEX0o0MRYJ
+certif:             KwYBBAHaRw8BAQdAtsqJpm9HQoZQcGsgyYXWo6HTpL2ftmS1zpUN9QRP+eOI9QQY
+certif:             FgoAJgIbAhYhBGe+5WNDtkINVQ7fKm1hf9CoW6raBQJfSj0aBQkB4TxpAIF2IAQZ
+certif:             FgoAHRYhBBI9hZt7d9+ekhmGJh1deaQ554fxBQJfSjQxAAoJEB1deaQ554fxmmUA
+certif:             /R+EwGqOE+ouplqFjsZ+qOJjr9lhR20YBb+MGEPGmi8mAP91veXBJGC9fes+hxi5
+certif:             zWPE33S05D6nCJzCJmU1AbDIBAkQbWF/0KhbqtqZ/AEA2xbaubytHUPhIYfCNBB1
+certif:             +J9rqDd+lyuOvx3quWYbU+UBAK4rrMBlEo850crLPCCu3Xq4BmQ37zt/D1lGDMn6
+certif:             zdkBuDgEX0o0RhIKKwYBBAGXVQEFAQEHQC5IsOtLayCP4MWIOuUmEhQBeBxI7PMd
+certif:             VgoxWyfncm0bAwEIB4h+BBgWCgAmAhsMFiEEZ77lY0O2Qg1VDt8qbWF/0KhbqtoF
+certif:             Al9KPS0FCQHhPFQACgkQbWF/0Khbqto47QEAw/QmDBtnN71aIAnc/WJ2qOgrColk
+certif:             8LWSwr0+ylijgXEA/jfDn/qjQzaw31bvjLD+6TKvrZSZ12SCXByzWxqQo2kGuDME
+certif:             X0o0VBYJKwYBBAHaRw8BAQdAP3H+QvZ8WpBITIW90SCIzZQpgBnJXWhy31qVLqbB
+certif:             5VqIfgQYFgoAJgIbIBYhBGe+5WNDtkINVQ7fKm1hf9CoW6raBQJfSj0tBQkB4TxG
+certif:             AAoJEG1hf9CoW6raJbUA+gKALIxkRZqA7ePWJY3JX7r8atbHSqIB2PF17Bp+ugrd
+certif:             AQDBTb2nC3sTSyddNGAk51axhDqTB+fe5G+S1QnQBnuiAA==
+certif:             =sqa5
+certif:             -----END PGP PUBLIC KEY BLOCK-----
+admin-c:            E1MO-DN42
+tech-c:             E1MO-DN42
+mnt-by:             E1MO-MNT
+source:             DN42
diff --git a/data/key-cert/PGPKEY-D32F65B7 b/data/key-cert/PGPKEY-D32F65B7
deleted file mode 100644
index d35bd00bd..000000000
--- a/data/key-cert/PGPKEY-D32F65B7
+++ /dev/null
@@ -1,86 +0,0 @@
-key-cert:           PGPKEY-D32F65B7
-method:             PGP
-fingerpr:           2D55 37BF 999E 72C3 FED5  180D B579 2B4D D32F 65B7
-owner:              e1mo <hello@e1mo.de>
-certif:             -----BEGIN PGP PUBLIC KEY BLOCK-----
-certif:             
-certif:             mQINBF4gpooBEACpWs7G13KoeqlLh5icENiucqM7u7xmAULf+Y3vX77GmwGZVYdE
-certif:             EIDDRJ/qWS4o7ShcybTGcIukBEy1A4c+bEBojPIvOpY/u0E6PUmAdUGKpmjyhdPg
-certif:             P0U07yYjDDcP/vyg3XsgCxQKp7boNzsb75QUsICsYsGcxyBVNKt2z68nj7sgePvi
-certif:             Yc8MFYV9btIfWtkoKERkK5Wm5TLitK+4mIqclVkYyH3PHLa2d0UlRCok+ltCpv2A
-certif:             dMwjNUobSTLyutKxNPQnqEWdoUx+f6/aE8QFP5dtLH7AG4nITMQ4qbReuWqsyhb1
-certif:             cdn19dxhhtRstHi1pbQoXckWqotGll+smSgo/D313m7W2mjGcwGnddT+bqdRf47Q
-certif:             qeteS6d3k3rA4DDjHYBy7/u6PevDnBJQ998r8dme5vlwkd0WiLPVIyTxHFGK2mrG
-certif:             aBIHBS7jN51aQVhWieWl7uA3LWgB2xSn4kdzx4ah8vpVkXJYoQt8BRwTorM5vaQa
-certif:             F4cT23tQvAqfRt+02Dcgl2AUsKP9N7/a3egGfDNQanewgRE7ecU0TAhXPESWlRIK
-certif:             VwxbSpm4/NlHe7M75Mgka6BvLFy6y3pT/StWrgIga3yZc6KE5C0J+0LPYCfKXmxV
-certif:             4DtZNPHetu28Y9rrLEGC553w10qxU80zlw78RKDmLCBDVxw8fGI7ZggCwQARAQAB
-certif:             tBRlMW1vIDxoZWxsb0BlMW1vLmRlPokCVwQTAQgAQQIbAwUJAeEzgAULCQgHAgYV
-certif:             CgkICwIEFgIDAQIeAQIXgBYhBC1VN7+ZnnLD/tUYDbV5K03TL2W3BQJeILqmAhkB
-certif:             AAoJELV5K03TL2W31e4P/0bD2D8L+xV8S41E4An0lN4BkpmeRXyzp5KjeQFX4ipV
-certif:             pgCH67CiBZoPmep9l7EoaLWLw+8gTU//tP6hxjDiZtkku7YMydHuqspizwaFkPD/
-certif:             vDEcdMtlxYIj1kNt9w1BHDK3/DMoqBn+xf4IADa/Y7tWFZkY38h4l2a3gYPretio
-certif:             mMUnhCYkbAs/QzWfzE3hL2p5yDde/+FnNDdpCOcbuI/+OPrjPUIFREHeXsuh4cXC
-certif:             VkVfINJl/VPhLWk70h21nZFthFWZUo0dOtcNwPIAB6S3erORc3BAImc0iwWZ8Ofu
-certif:             MEcjQuOL1z9FMh+m9YDITqCw+ZlDtqcWcl2lU+YYk5vxkDS64Q7iDJAhG2bHCwWF
-certif:             nzYZjrAyjIvqNme8NXJFMMHOoch2Hwdj8yOSiWg6nebfrONwZGZNupDfB6pP41XN
-certif:             n1tMow4zhYpUSE6NN8c6584yR9FlMXcJv6pVE/6UtOo8gNylqZeMgkCjrvC8bIVC
-certif:             cref7udud07l7aKr6BqAaHcButFVPlDRRn/9ueW2j8kgILvc1uAhy6ranrF/DeO5
-certif:             dPiq+yMzATm8AuUp/5hwKl758cRI6SFE8Z1WZupKZ7gZWiujoJ7aG50TtHUSRX8O
-certif:             7E3J3c6Igby/Vvkww5ZMctyadgD3i5oR6Qbw8MRF/eaM9WtAoNO7eaxqd9ZywG9Y
-certif:             tBJlMW1vIDxnaXRAZTFtby5kZT6JAlQEEwEIAD4WIQQtVTe/mZ5yw/7VGA21eStN
-certif:             0y9ltwUCXiCnJQIbAwUJAeEzgAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC1
-certif:             eStN0y9ltwlTD/9txPZY6wrKeWYSHsaBgKf8ZdEGpJ6cgr404wdHhjPnR5bcqQpP
-certif:             tw2XzhNI00FiLLfoHmdmNzR3ZvGpzm/Nz6Dhn9CaQoCwMm3fho+B9WXbzkl7q+1a
-certif:             AfdKa8uPP7I7BG/MpruaAfx22t40ChhvI4TjcLTM+wPbjL3A/2CvlH9sgc1S74bJ
-certif:             MQr5hwYyHFGjIH+wJGRTTvh5y0f7rDjb0KLzYj5jNzCXiUyIW1i6Cl+xuKzmhOuT
-certif:             6H+gnFCpyMoVwnYsAUWh09EPLoLG67CiH97iX0UjOmXMEkdLjNCeAw9S33dbZABr
-certif:             QJWMoJMmjwJxVlWx1EdM0j2j22XIP7crSS6xycYs+/+t6VZ2yLv4E51paISntflZ
-certif:             98yGzNToeMog8szQk9r5xmwZ+JU6TlnjDu3T0X10Mp23mS5KrggOyP9xpb+lHahe
-certif:             n/e+FWU/Q5KSp8Z1iXR6hvj4AjdI3L9o5wKLkiyV0SmD9/AigSXqAQlnerF4dzki
-certif:             CKMQo4/JKooSIK+WvmnjNPKpYb9BRXg1CKvm8GAqrjXH/GO0z0Y5kJ4Lt0+MPWz6
-certif:             hFyiDDBK+OAliZiGhsfmCQVAUmjBJ0b6cJQLIFGIYuxLPrBbpoWMrxpQ/f0rlkep
-certif:             s+dBhzDdixxmsQqcXsSPj3zrUhO/tL/X3o8Tp+pGtOPwVlyfI8+AmQJeQLQUZTFt
-certif:             byA8bGlzdHNAZTFtby5kZT6JAlQEEwEIAD4WIQQtVTe/mZ5yw/7VGA21eStN0y9l
-certif:             twUCXrA8rAIbAwUJAeEzgAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC1eStN
-certif:             0y9lt5UCEACXeUpgR/G/2en40jMPYc4j9YA7EVlVEMzsH1UbDfxAW63kWA8WpfxU
-certif:             iRNBqwJRbDwKhtLxXSekRTiPWHOYimS9YGPYtjYCsHppAoacOy10uwHGBz0SgnRz
-certif:             PW1NyQNu1qlEs8NsrZQGCcP+x/HIWM4S6RdphDZydXx0Qyk0B1eAdeh65A5stkYP
-certif:             60RygQD5MHO+7HTMMZCGedcA5UxwXPE84vWxhb6tYy3Q7LC9AtT9H5hkf/d/SVEH
-certif:             jbTxH5dD/1m1oclL8OUS1ZaGZfF9jEI+f7vULdkyehECzIui7FCa4MZ+7nkOub67
-certif:             pd7x9zy60IXQVD4vmjQxlxwbG4URWTgo1icZCp9L2Ae22VVl9vW0Rf9567/kgXNR
-certif:             ibXrJHyh6rO2eW4gg8TDYAdiHhV7JuEDYWCCsBd/dumDEvjPbbXD5GPxZkfDZSla
-certif:             D8sUPpspWme1tJgulkZjMr82qEphodY75DuV0k9+oPuK8EqoZup5gZkfvu/ggEiM
-certif:             vIXP/YFmx6eCFpzwSWSmdJEWJP5cT+vJ5y7MleqIwB9HJ1UzL6hrj4aJkC5X9WBY
-certif:             gKWJ0eo4q2Vd3yU/IJvlYzIc3kQj0s+UGmeWEjAlZCjNQLZqA0X8nmS/PdCszkdH
-certif:             GjXuaBtq7T5e1aKoSg8JKNbvJhBrnJIYDVRl46QMcEl99u0by0EYDLkCDQReIKaK
-certif:             ARAAqeqpcj8yHz12TjLBAfzCXYlyaDz1YWeCTkKLcu5uZPs5rnzb/OaoxglpoXiM
-certif:             7CxirCceJ1Nje7Iu5jJZ0j/ViCC1Iv7T22bnboZ9+8GVtNmfzuXlH0hR3x/6xUIE
-certif:             5NZK1FQvEq+1yWOqaEARYzIhhmF3STIlL7cYDdsEDouUrc4Ua/GXCF1e+3YM3JaT
-certif:             kGIaoVuSg+D9Lx8UAoZcWGihbq1v4D2H2zMbu2kxyPRuqHWZY2OHkbMLU4uIwiM2
-certif:             yUz4G4uCfMgH8X2nBiB2MQwiQYSAa1Z9g7fGzn2HriKiqYuWhe9kHDpw13PA+qrH
-certif:             g2rx2MLtzSdLiAU7cR2+talXjlvdzbalrPB+4cmbC9W4NPVzMkYclnN5t6GdGXd2
-certif:             3e5a/ZK4Y1X66YclbPQ+uCRpjR08J6lsKnR8ng1XK9G7e70WsFvCCoSJbsu2TGSw
-certif:             ilaJQj0oz65SeWxDvlFbuA0in/QU/iA37/rZYdXYVTyM9IHeCrTszha8rDAlb+5t
-certif:             x3AN8In7k+ckoZjFtW/loi1Kf+6ThZZgZPQTsYvsTbqNvx04gnieqJQHF2rTScAZ
-certif:             /ukRVwDVflj0u7k60YY5U/GxYrx0OmmrfN+JHvgmFjWEPyhrCqGLMFXa1d4FfPEx
-certif:             cTRuVSGUZ0Pwb6O4vRq8O1ibmkywgZq93C3XiJ2CbjLK7eMAEQEAAYkCPAQYAQgA
-certif:             JhYhBC1VN7+ZnnLD/tUYDbV5K03TL2W3BQJeIKaKAhsMBQkB4TOAAAoJELV5K03T
-certif:             L2W3sR0P+wVE2O8rFhCOE2ER/K7aNffuJv631gt7i7WtPeF+y29LBzF5RISYtHEN
-certif:             FMaUREGjPGKkYth+m4Eo/Q7x0T3cKSEJvL2Bdkl0+D7dV6xUWtawGvl0y7Fr/jlE
-certif:             kg2zdZrJ6+wM/riLu6Mhe1a+xXua9EIpzRspnu+pjKftufd1yAs1Rj0rrLWisBTr
-certif:             xs20gKUUxfzx+YShZ8Hyj213gomMjsvvkkeXkoVdEmPElAV1AbEP6k1KkNEENUT/
-certif:             NDSbxE2yBeEYgxE48xnzJOkC7SpO5cj+3jgiegtzYA3eNqxTZMS2/zobxmKSpYVT
-certif:             B+CzQrHrg6o5dmrHE2gcrQ+xWh2PDqylKqjI0QXgL/lOtlgsGvP2lY+nbZsJP1wr
-certif:             qd3loyRQCILgjvypHKu0Kxp3NTfaTsU3kbrND8Zr9+queKSeVyAMXTtwyTolt8Rn
-certif:             nf8sbjRJ4qau5veClvQs3nDsq6f9NOZHHPFfZ2KbTRpstrDjoCduypdt5dQhe2c8
-certif:             S3w8duRR9MSCtg8TZh8hd7BxqF0t5K6SGke6fFuurhYz6dqmGys8fyyn+WJLQlHJ
-certif:             ij0Xcc2VSLx0zFcFzDs/4Dhmb2m7jW2OlU0Y9fE0ZsVoQhl/igjwBXe/+Ujkn3BQ
-certif:             I9Obtc6MXqYGSzQ4wtqfySN5uBa0ekx4E3mS2kl5yBDOnZwWAa4o
-certif:             =XnXU
-certif:             
-certif:             -----END PGP PUBLIC KEY BLOCK-----
-admin-c:            E1MO-DN42
-tech-c:             E1MO-DN42
-mnt-by:             E1MO-MNT
-source:             DN42
diff --git a/data/mntner/E1MO-MNT b/data/mntner/E1MO-MNT
index 78ab185ef..37ff3c9a7 100644
--- a/data/mntner/E1MO-MNT
+++ b/data/mntner/E1MO-MNT
@@ -2,5 +2,5 @@ mntner:             E1MO-MNT
 admin-c:            E1MO-DN42
 tech-c:             E1MO-DN42
 mnt-by:             E1MO-MNT
-auth:               PGPKEY-D32F65B7
+auth:               PGPKEY-A85BAADA
 source:             DN42