diff --git a/roles/openshift-apps/distgit-bugzilla-sync/files/email_overrides.toml b/roles/openshift-apps/distgit-bugzilla-sync/files/email_overrides.toml
new file mode 100644
index 0000000000..e9b77323ec
--- /dev/null
+++ b/roles/openshift-apps/distgit-bugzilla-sync/files/email_overrides.toml
@@ -0,0 +1,146 @@
+# This file contains the list of FAS email addresses to override for bugzilla.
+# By default we expect that the email address set in FAS corresponds to
+# the bugzilla account of the person.
+# However, some people prefer to use different addresses in FAS and in
+# bugzilla (for example if they want to use their @fedoraproject alias in
+# bugzilla). To support these requests, this file maps FAS email addresses to
+# Bugzilla email addresses where they differ.
+#
+# Example:
+# "foo@bar.com" = "bar@foo.org"
+
+# Control Center Team: Bugzilla user but email doesn"t exist
+# 9908: "control-center-maint@redhat.com"
+# Matt Domsch"s rebuild script -- bz email goes to /dev/null
+# 103590: "ftbfs@fedoraproject.org"
+
+# Konstantin Ryabitsev
+"mricon@gmail.com" = "icon@fedoraproject.org"
+# Sean Reifschneider
+"jafo@tummy.com" = "jafo-redhat@tummy.com"
+# Karen Pease
+"karen-pease@uiowa.edu" = "meme@daughtersoftiresias.org"
+# Robert Scheck
+"redhat@linuxnetz.de" = "redhat-bugzilla@linuxnetz.de"
+# Scott Bakers:
+"bakers@web-ster.com" = "scott@perturb.org"
+# Colin Charles:
+"byte@aeon.com.my" = "byte@fedoraproject.org"
+# W. Michael Petullo:
+"mike@flyn.org" = "redhat@flyn.org"
+# Elliot Lee:
+"sopwith+fedora@gmail.com" = "sopwith@redhat.com"
+# Máirín Duffy
+"fedora@linuxgrrl.com" = "duffy@redhat.com"
+# Muray McAllister:
+"murray.mcallister@gmail.com" = "mmcallis@redhat.com"
+# William Jon McCann:
+"mccann@jhu.edu" = "jmccann@redhat.com"
+# Sindre Pedersen Bjørdal:
+"foolish@fedoraforum.org" = "sindrepb@fedoraproject.org"
+# Jesus M. Rodriguez:
+"jmrodri@gmail.com" = "jesusr@redhat.com"
+# Roozbeh Pournader:
+"roozbeh@farsiweb.info" = "roozbeh@gmail.com"
+# Michael DeHaan:
+"michael.dehaan@gmail.com" = "mdehaan@redhat.com"
+# Sebastian Gosenheimer:
+"sgosenheimer@googlemail.com" = "sebastian.gosenheimer@proio.com"
+# Ben Konrath:
+"bkonrath@redhat.com" = "ben@bagu.org"
+# Kai Engert:
+"kaie@redhat.com" = "kengert@redhat.com"
+# William Jon McCann:
+"william.jon.mccann@gmail.com" = "jmccann@redhat.com"
+# Simon Wesp:
+"simon@w3sp.de" = "cassmodiah@fedoraproject.org"
+# Robert M. Albrecht:
+"romal@gmx.de" = "mail@romal.de"
+# Davide Cescato:
+"davide.cescato@iaeste.ch" = "ceski@fedoraproject.org"
+# Nick Bebout:
+"nick@bebout.net" = "nb@fedoraproject.org"
+# Niels Haase:
+"haase.niels@gmail.com" = "arxs@fedoraproject.org"
+# Thomas Janssen:
+"th.p.janssen@googlemail.com" = "thomasj@fedoraproject.org"
+# Michael J Gruber:
+"michaeljgruber+fedoraproject@gmail.com" = "mjg@fedoraproject.org"
+# Juan Manuel Rodriguez Moreno:
+"nushio@gmail.com" = "nushio@fedoraproject.org"
+# Andrew Cagney:
+"andrew.cagney@gmail.com" = "cagney@fedoraproject.org"
+# Jeremy Katz:
+"jeremy@katzbox.net" = "katzj@fedoraproject.org"
+# Dominic Hopf:
+"dmaphy@gmail.com" = "dmaphy@fedoraproject.org"
+# Christoph Wickert:
+"christoph.wickert@googlemail.com" = "cwickert@fedoraproject.org"
+# Elliott Baron:
+"elliottbaron@gmail.com" = "ebaron@fedoraproject.org"
+# Thomas Spura:
+"spurath@students.uni-mainz.de" = "tomspur@fedoraproject.org"
+# Adam Miller:
+"maxamillion@gmail.com" = "admiller@redhat.com"
+# Garrett Holmstrom:
+"garrett.holmstrom@gmail.com" = "gholms@fedoraproject.org"
+# Tareq Al Jurf:
+"taljurf.fedora@gmail.com" = "taljurf@fedoraproject.org"
+# Josh Kayse:
+"jokajak@gmail.com" = "jokajak@fedoraproject.org"
+# Behdad Esfahbod:
+"fedora@behdad.org" = "behdad@fedoraproject.org"
+# Daniel Bruno:
+"danielbrunos@gmail.com" = "dbruno@fedoraproject.org"
+# Beth Lynn Eicher:
+"bethlynneicher@gmail.com" = "bethlynn@fedoraproject.org"
+# Andre Robatino:
+"andre.robatino@verizon.net" = "robatino@fedoraproject.org"
+# Jeff Sheltren:
+"jeff@tag1consulting.com" = "sheltren@fedoraproject.org"
+# Josh Boyer:
+"jwboyer@gmail.com" = "jwboyer@redhat.com"
+# Matthew Miller:
+"mattdm@mattdm.org" = "mattdm@redhat.com"
+# Jamie Nguyen:
+"j@jamielinux.com" = "jamielinux@fedoraproject.org"
+# Nikos Roussos:
+"nikos@roussos.cc" = "comzeradd@fedoraproject.org"
+# Benedikt Schäfer:
+"benedikt@schaefer-flieden.de" = "ib54003@fedoraproject.org"
+# Ricky Elrod:
+"codeblock@elrod.me" = "relrod@redhat.com"
+# David Xie:
+"david.scriptfan@gmail.com" = "davidx@fedoraproject.org"
+# Felix Schwarz:
+"felix.schwarz@oss.schwarz.eu" = "fschwarz@fedoraproject.org"
+# Martin Holec:
+"martix@martix.names" = "mholec@redhat.com"
+# John Dulaney:
+"j_dulaney@live.com" = "jdulaney@fedoraproject.org"
+# Niels de Vos:
+"niels@nixpanic.net" = "ndevos@redhat.com"
+# Shawn Wells:
+"shawn@redhat.com" = "swells@redhat.com"
+# Christopher Tubbs:
+"ctubbsii+fedora@gmail.com" = "ctubbsii@fedoraproject.org"
+# Björn Esser:
+"bjoern.esser@gmail.com" = "besser82@fedoraproject.org"
+# Amit Shah:
+"amit@amitshah.net" = "amitshah@fedoraproject.org"
+# Mark Wielard:
+"fedora@wildebeest.org" = "mjw@fedoraproject.org"
+# Benjamin Lefoul:
+"benjamin.lefoul@nwise.se" = "lef@fedoraproject.org"
+# Mike Ruckman:
+"roshi@mykolab.com" = "roshi@fedoraproject.org"
+# Dusty Mabe:
+"dusty@dustymabe.com" = "dustymabe@redhat.com"
+# Ben Williams:
+"vaioof@gmail.com" = "jbwillia@math.vt.edu"
+# David Dykstra:
+"dwd@fnal.gov" = "dwd@fedoraproject.org"
+# Till Hofmann:
+"till.hofmann@posteo.de" = "thofmann@fedoraproject.org"
+# Philip Kovacs:
+"phil@mxbits.io" = "pkfed@fedoraproject.org"
diff --git a/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml b/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml
index 434737aefe..74c2ff4f04 100644
--- a/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml
+++ b/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml
@@ -9,3 +9,5 @@ metadata:
 data:
   configuration.toml: |-
     {{ load_file('configuration.toml') | indent }}
+  email_overrides.toml: |-
+    {{ load_file('email_overrides.toml') | indent }}