diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..7c85fb7b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Thomas Tanon <thomas@pellissier-tanon.fr> <thomaspt@hotmail.fr> <Tpt@users.noreply.github.com>
+Thomas Tanon <thomas@pellissier-tanon.fr>
+Thomas Tanon <thomas.pellissier-tanon@helsing.ai>