diff --git a/.githubmap b/.githubmap
index 35a3ef8a12f78..ccfcbc5aa5c0f 100644
--- a/.githubmap
+++ b/.githubmap
@@ -21,7 +21,7 @@ dvanders Dan van der Ster <daniel.vanderster@cern.ch>
 dzafman David Zafman <dzafman@redhat.com>
 fullerdj Douglas Fuller <dfuller@redhat.com>
 gregsfortytwo Gregory Farnum <gfarnum@redhat.com>
-ifed01 Igor Fedotov <ifedotov@mirantis.com>
+ifed01 Igor Fedotov <ifedotov@suse.com>
 ivancich J. Eric Ivancich <ivancich@redhat.com>
 jcsp John Spray <john.spray@redhat.com>
 jlayton Jeff Layton <jlayton@redhat.com>
diff --git a/.mailmap b/.mailmap
index 8a7b8083a3c1b..e2c6ada284a24 100644
--- a/.mailmap
+++ b/.mailmap
@@ -155,8 +155,7 @@ Hong Zhangoole <hong.zhangoole@gmail.com>
 Huamin Chen <hchen@redhat.com>
 Huang Jun <hjwsm1989@gmail.com>
 Ignacio Bravo <ibravo@hotmail.com>
-Igor Fedotov <ifedotov@mirantis.com>
-Igor Fedotov <ifedotov@mirantis.com> <root@osscr03r06s11.local.lan>
+Igor Fedotov <ifedotov@suse.com>
 Ilja Slepnev <islepnev@gmail.com>
 Ilya Shipitsin <chipitsine@gmail.com> <ilia@localhost.localdomain>
 Ilya Dryomov <idryomov@redhat.com> <idryomov@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index 954d889f6e312..35cd63221fbad 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -332,7 +332,6 @@ Mirantis <contact@mirantis.com> Alexey Sheplyakov <asheplyakov@mirantis.com>
 Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.com>
 Mirantis <contact@mirantis.com> Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
 Mirantis <contact@mirantis.com> Dmytro Iurchenko <diurchenko@mirantis.com>
-Mirantis <contact@mirantis.com> Igor Fedotov <ifedotov@mirantis.com>
 Mirantis <contact@mirantis.com> Kiseleva Alyona <akiselyova@mirantis.com>
 Mirantis <contact@mirantis.com> Mykola Golub <mgolub@mirantis.com>
 Mirantis <contact@mirantis.com> Proskurin Kirill <kproskurin@mirantis.com>
@@ -498,6 +497,7 @@ SUSE <contact@suse.com> David Disseldorp <ddiss@suse.de>
 SUSE <contact@suse.com> Dirk Mueller <dmueller@suse.com>
 SUSE <contact@suse.com> Hannes Reinecke <hare@suse.de>
 SUSE <contact@suse.com> Holger Macht <hmacht@suse.de>
+SUSE <contact@sise.com> Igor Fedotov <ifedotov@suse.com>
 SUSE <contact@suse.com> Jan Fajerski <jfajerski@suse.com>
 SUSE <contact@suse.com> Jesse Williamson <jesse.williamson@suse.com>
 SUSE <contact@suse.com> João Eduardo Luís <joao@suse.de>
diff --git a/.peoplemap b/.peoplemap
index b7b2d2357bbd3..179a0414844b0 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -23,6 +23,7 @@ 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>
 Gregory Meno <gmeno@redhat.com> <gregory.meno@inktank.com>
+Igor Fedotov <ifedotov@suse.com> Igor Fedotov <ifedotov@mirantis.com>
 Ilya Dryomov <idryomov@redhat.com> Ilya Dryomov <ilya.dryomov@inktank.com>
 Jenkins <jenkins@ceph.com> Jenkins <jenkins@inktank.com>
 João Eduardo Luís <joao@suse.de> João Eduardo Luís <joao.luis@inktank.com>