diff --git a/.mailmap b/.mailmap
index 2386251c..edbf3934 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,4 +2,6 @@ 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>
+Henrik Triem <henrik.triem@icinga.com> <43344334+htriem@users.noreply.github.com>
+<henrik.triem@icinga.com> <henrik.triem@netways.de>
+<yonas.habteab@icinga.com> <yonas.habteab@netways.de>
diff --git a/AUTHORS b/AUTHORS
index f75fc0fc..cbb6f89b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,9 @@
 Alexander A. Klimov <alexander.klimov@icinga.com>
 Eric Lippmann <eric.lippmann@icinga.com>
-Henrik Triem <henrik.triem@netways.de>
+Henrik Triem <henrik.triem@icinga.com>
 Johannes Meyer <johannes.meyer@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>
+Yonas Habteab <yonas.habteab@icinga.com>