diff --git a/.mailmap b/.mailmap
index 494fc13c..2386251c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,3 +2,4 @@ Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@icinga.com>
 Diana Flach <crunsher@bamberg.ccc.de> <Crunsher@users.noreply.github.com>
 Diana Flach <crunsher@bamberg.ccc.de> <jean-marcel.flach@icinga.com>
 Diana Flach <crunsher@bamberg.ccc.de> <jean.flach@icinga.com>
+Henrik Triem <henrik.triem@netways.de> <43344334+htriem@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index eb25d6e9..f75fc0fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,9 @@
 Alexander A. Klimov <alexander.klimov@icinga.com>
 Eric Lippmann <eric.lippmann@icinga.com>
-Jean Flach <jean.flach@icinga.com>
+Henrik Triem <henrik.triem@netways.de>
 Johannes Meyer <johannes.meyer@icinga.com>
-Justin Müller <justin.mueller@icinga.com>
-Markus Frosch <markus.frosch@icinga.com>
+Julian Brost <julian.brost@icinga.com>
 Michael Friedrich <michael.friedrich@icinga.com>
 Noah Hilverling <noah.hilverling@icinga.com>
+Ravi Kumar Kempapura Srinivasa <ravi.srinivasa@icinga.com>
+Yonas Habteab <yonas.habteab@netways.de>