diff --git a/openstack-config/aliases b/openstack-config/aliases
index 1987cf1..9b9589d 100644
--- a/openstack-config/aliases
+++ b/openstack-config/aliases
@@ -96,6 +96,8 @@ michael.barton@rackspace.com mike@weirdlooking.com
 michael.still@canonical.com mikal@stillhq.com
 mike-launchpad@weirdlooking.com mike@weirdlooking.com
 mordred@hudson mordred@inaugust.com
+m@metacloud.com morgan.fainberg@gmail.com
+morgan@metacloud.com morgan.fainberg@gmail.com
 treinish@linux.vnet.ibm.com mtreinish@kortar.org
 nachi@nttmcl.com ueno.nachi@lab.ntt.co.jp
 nati.ueno@gmail.com ueno.nachi@lab.ntt.co.jp
diff --git a/openstack-config/email-map b/openstack-config/email-map
index e891a01..6b408aa 100644
--- a/openstack-config/email-map
+++ b/openstack-config/email-map
@@ -48,6 +48,8 @@ lzyeval@gmail.com SINA < 2012-06-19
 me@not.mn SwiftStack
 me@not.mn Rackspace < 2012-06-19
 mordred@inaugust.com Rackspace < 2011-12-01
+morgan.fainberg@gmail.com Metacloud < 2014-05-23
+morgan.fainberg@gmail.com HP
 mtreinish@kortar.org HP
 mtreinish@kortar.org IBM < 2014-04-26
 reldan@oscloud.ru Grid Dynamics
diff --git a/openstack-config/groups/hp b/openstack-config/groups/hp
index 2cbfe5a..5ce903a 100644
--- a/openstack-config/groups/hp
+++ b/openstack-config/groups/hp
@@ -24,3 +24,4 @@ jp@jamezpolley.com
 steven@wedontsleep.org
 gleebix@gmail.com
 code@gentlydownthe.net
+morgan.fainberg@gmail.com
diff --git a/openstack-config/launchpad-ids.txt b/openstack-config/launchpad-ids.txt
index 6d0d26c..e068f02 100644
--- a/openstack-config/launchpad-ids.txt
+++ b/openstack-config/launchpad-ids.txt
@@ -567,6 +567,8 @@ mcgrue ben@pistoncloud.com
 mdegerne mdegerne@gmail.com
 mdragon mdragon@rackspace.com
 mdrnstm m@metacloud.com
+mdrnstm morgan@metacloud.com
+mdrnstm morgan.fainberg@gmail.com
 meera-belur meera.belur@hp.com
 meizu647 meizu647@gmail.com
 melwitt melwitt@yahoo-inc.com