diff --git a/manifests/site.pp b/manifests/site.pp
index 764e68e5a0..7b3b98c8b4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,6 +24,7 @@ node 'review.openstack.org' {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 29418],
     sysadmins                 => hiera('sysadmins', []),
+    extra_aliases             => { 'gerrit2' => 'root' },
   }
 
   class { 'openstack_project::review':
@@ -65,6 +66,7 @@ node 'review-dev.openstack.org' {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 29418],
     sysadmins                 => hiera('sysadmins', []),
+    extra_aliases             => { 'gerrit2' => 'root' },
     afs                       => true,
   }
 
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index c0f26e8567..a143f14c3b 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -8,6 +8,7 @@ class openstack_project::server (
   $iptables_rules6           = [],
   $iptables_allowed_hosts    = [],
   $sysadmins                 = [],
+  $extra_aliases             = {},
   $pin_puppet                = '3.',
   $ca_server                 = undef,
   $enable_unbound            = true,
@@ -181,7 +182,8 @@ class openstack_project::server (
 
   if $manage_exim {
     class { 'exim':
-      sysadmins => $sysadmins,
+      sysadmins     => $sysadmins,
+      extra_aliases => $extra_aliases,
     }
   }