diff --git a/.gitignore b/.gitignore
index 84e0c20..66a7613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ helm-charts/*
 
 community-operators/
 community-operators-prod/
+
+# Git
+.gitconfig
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..03594a7
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Martin Montes <martin11lrx@gmail.com> Martin Montes <martin.montes@mariadb.com>
+Martin Montes <martin11lrx@gmail.com> Martin Montes <mariadb-operator@proton.me>