diff --git a/.mailmap b/.mailmap
index 8f14718bc..d7286b94c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,3 +12,14 @@ Raccoon <raccoon@hackmd.io>                  Raccoon <a60814billy@gmail.com>
 Peter Dave Hello <hsu@peterdavehello.org>    Peter Dave Hello <PeterDaveHello@users.noreply.github.com>
 
 Claudius Coenen <github@amenthes.de>         Claudius Coenen <opensource@amenthes.de>
+
+Tilman Vatteroth <git@tilmanvatteroth.de>    Tilman Vatteroth <tilman.vatteroth@tu-dortmund.de>
+
+Philip Molares <philip.molares@udo.edu>      Philip Molares <git@molar.es>
+
+Yannick Bungers <git@innay.de>               Yannick Bungers <github@innay.de>
+
+Jonas Zohren <git-pbkyr@jzohren.de>          Jonas Zohren <jonas.zohren@adesso.de>
+Jonas Zohren <git-pbkyr@jzohren.de>          Jonas Zohren <15788906+jfowl@users.noreply.github.com>
+
+Renovate Bot <bot@renovateapp.com>           renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index b51650be9..cf8d77c8e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,72 +11,20 @@ To regenerate, use `git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort -uf`.
 
 # Authors
 
-alecdwm <alec@owls.io>
-bananaappletw <bananaappletw@gmail.com>
-Bartlomiej Szala <fenix440@gmail.com>
-BoHong Li <a60814billy@gmail.com>
-Bryan Davis <bd808@wikimedia.org>
-butlerx <butlerx@notthe.cloud>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Christian Schuhmann <madebyherzblut@users.noreply.github.com>
-Colin Maudry <colin@maudry.com>
-Dmytro Kytsmen <dmitrokytsmen@gmail.com>
-Fabien Meghazi <agr@amigrave.com>
-Florian Rhiem <florian.rhiem@gmail.com>
-geekyd <singhsince94@gmail.com>
-GhiMax <ghina8@gmail.com>
-greenkeeperio-bot <support@greenkeeper.io>
-Himura Kazuto <Himura2la@users.noreply.github.com>
-Ho33e5 <ho33e5@gmail.com>
-Ian Dees <ian.dees@gmail.com>
-Ikumi Shimizu <193s@users.noreply.github.com>
-ivanorsolic <ivanorsolic@users.noreply.github.com>
-jackycute <jacky_cute0808@hotmail.com>
-jackycute <jackymaxj@gmail.com>
-Jakub Sygnowski <sygnowski@gmail.com>
-James Stephenson <c4p7.fl1n7@gmail.com>
-Jan Kunzmann <jan-github@phobia.de>
-Jannik Lorenz <dev@janniklorenz.de>
-Jason Croft <jcroft@velocity.org>
-Johannes Weißl <jargon@molb.org>
-Jordan Matelsky <j6k4m8@gmail.com>
-Jun SAKATA <jun.bj141400@gmail.com>
-Kaiyu Shi <skyisno.1@gmail.com>
-knjcode <knjcode@gmail.com>
-Kotaro Yamamoto <kota.crk@gmail.com>
-Lars Karlsson <lars@kajes.se>
-Laura Kyle <laura.kyle91@gmail.com>
-LluisArevalo <thorin119@gmail.com>
-Marcelo Alencar <marceloalves@ufpa.br>
-Martijnpold <martijntje7@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-neopostmodern <clemens@neopostmodern.com>
-NV <nvsofts@gmail.com>
-Ömer Erdinç Yağmurlu <omeryagmurlu@gmail.com>
-p0v1n0m <p0v1n0m@gmail.com>
-Pablo Guerrero <pablo.guerrero@gmail.com>
-Pablo Guerrero <pablo.guerrero@sap.com>
-Paras <paraschadha2052@gmail.com>
-Patrick Andersen <patrick@bacha.dk>
-Peter Dave Hello <hsu@peterdavehello.org>
-Peter Dave Hello <PeterDaveHello@users.noreply.github.com>
-Philipp Zumstein <zuphilip@users.noreply.github.com>
-Raccoon Li <a60814billy@gmail.com>
-robert <ahmerov.rt@molodost.bz>
-Sergio Valverde <svg153@users.noreply.github.com>
+Abhilasha Sinha <abhisinha662000@gmail.com>
+Alexandru Văleanu <valeanu_alex@yahoo.com>
+Chasethechicken <neuringe1234@gmail.com>
+David Mehren <git@herrmehren.de>
+Erik Michelson <github@erik.michelson.eu>
+Falk Rehse <neuringe1234@gmail.com>
+Hugo Peixoto <hugo.peixoto@gmail.com>
+Jonas Zohren <git-pbkyr@jzohren.de>
+Nicolas Dietrich <nidi@mailbox.org>
+Nicolas Lenz <nicolas@eisfunke.com>
+Philip Molares <philip.molares@udo.edu>
+Renovate Bot <bot@renovateapp.com>
 Sheogorath <sheogorath@shivering-isles.com>
-Simon Joda Stößer <SimJoSt@users.noreply.github.com>
-S.Noda <noda@fenrir.co.jp>
-Stratos Gerakakis <stratosgear@gmail.com>
-The Gitter Badger <badger@gitter.im>
-tkqubo <tk.qubo@gmail.com>
-tkykm <tkykm@users.noreply.github.com>
-Tom Wyckhuys <tomwyckhuys@gmail.com>
-Wonder Chang <iwonder.tw@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Xavier Marques <xaviermarques4f@gmail.com>
-xnum <s000032001@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-zachariast <zachariastraianos@gmail.com>
-Zankio <xxoojoeooxx1@gmail.com>
-蒼時弦也 <elct9620@frost.tw>
+Simon C <simonc@linux.com>
+Thomas Snowden <zapperchamp1@gmail.com>
+Tilman Vatteroth <git@tilmanvatteroth.de>
+Yannick Bungers <git@innay.de>