diff --git a/.mailmap b/.mailmap
index ff4d5808737..b95c3833505 100644
--- a/.mailmap
+++ b/.mailmap
@@ -97,6 +97,7 @@ João Eduardo Luís <joao@redhat.com> <jecluis@gmail.com>
 João Eduardo Luís <joao@redhat.com> <jluis@redhat.com>
 João Eduardo Luís <joao@redhat.com> Joao Eduardo Luis <jeclui@gmail.com>
 João Eduardo Luís <joao@redhat.com> Joao Eduardo Luis <joao@redhat.com>
+Joao Eduardo Luis <joao@suse.de> <jluis@suse.com>
 Joe Buck <jbbuck@gmail.com> <buck@soe.ucsc.edu>
 John Spray <jspray@redhat.com> <jcspray@gmail.com>
 John Spray <jspray@redhat.com> john <jspray@redhat.com>
diff --git a/.organizationmap b/.organizationmap
index b4d3d816994..a1064e72172 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -223,6 +223,7 @@ SUSE <contact@suse.com> Adam Spiers <aspiers@suse.com>
 SUSE <contact@suse.com> David Disseldorp <ddiss@suse.de>
 SUSE <contact@suse.com> Hannes Reinecke <hare@suse.de>
 SUSE <contact@suse.com> Holger Macht <hmacht@suse.de>
+SUSE <contact@suse.com> Joao Eduardo Luis <joao@suse.de>
 SUSE <contact@suse.com> Karl Eichwalder <ke@suse.de>
 SUSE <contact@suse.com> Owen Synge <osynge@suse.com>
 SUSE <contact@suse.com> Thorsten Behrens <tbehrens@suse.com>
diff --git a/.peoplemap b/.peoplemap
index 9867dc35c92..c83d17650f5 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -21,7 +21,8 @@ Dan Mick <dmick@redhat.com> Dan Mick <dan.mick@inktank.com>
 David Zafman <dzafman@redhat.com> David Zafman <david.zafman@inktank.com>
 Greg Farnum <gfarnum@redhat.com> Greg Farnum <greg@inktank.com>
 Ilya Dryomov <idryomov@redhat.com> Ilya Dryomov <ilya.dryomov@inktank.com>
-João Eduardo Luís <joao@redhat.com> João Eduardo Luís <joao.luis@inktank.com>
+Joao Eduardo Luis <joao@suse.de> João Eduardo Luís <joao@redhat.com>
+Joao Eduardo Luis <joao@suse.de> João Eduardo Luís <joao.luis@inktank.com>
 John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>
 John Wilkins <jwilkins@redhat.com> John Wilkins <john.wilkins@inktank.com>
 Josh Durgin <jdurgin@redhat.com> Josh Durgin <josh.durgin@inktank.com>