diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..f5b10916
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Oliver Davies <oliver@oliverdavies.dev> <339813+opdavies@users.noreply.github.com>
+Oliver Davies <oliver@oliverdavies.dev> <oliver+github@oliverdavies.uk>
+Oliver Davies <oliver@oliverdavies.dev> <oliver.davies@inviqa.com>
+Oliver Davies <oliver@oliverdavies.dev> <oliver@microserve.io>
+Oliver Davies <oliver@oliverdavies.dev> <oliver@oliver@oliverdavies.uk>
+Oliver Davies <oliver@oliverdavies.dev> <oliver@oliverdavies.co.uk>
+Oliver Davies <oliver@oliverdavies.dev> <oliver@oliverdavies.uk>
+Oliver Davies <oliver@oliverdavies.dev> <opdavies@gmail.com>