diff --git a/manifests/site.pp b/manifests/site.pp
index 003e5a6cc1..23cd0d27bd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -258,6 +258,12 @@ node 'groups-dev.openstack.org' {
 
 # Node-OS: trusty
 node 'lists.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [25, 80, 465],
+    manage_exim => false,
+    purge_apt_sources => false,
+  }
+
   class { 'openstack_project::lists':
     listadmins   => hiera('listadmins', []),
     listpassword => hiera('listpassword'),
@@ -1287,6 +1293,11 @@ node 'pbx.openstack.org' {
 # A backup machine.  Don't run cron or puppet agent on it.
 node /^ci-backup-.*\.openstack\.org$/ {
   $group = "ci-backup"
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [],
+    manage_exim => false,
+    purge_apt_sources => false,
+  }
   include openstack_project::backup_server
 }
 
diff --git a/modules/openstack_project/manifests/backup_server.pp b/modules/openstack_project/manifests/backup_server.pp
index 0a8ee2f5ed..d789b9dd5e 100644
--- a/modules/openstack_project/manifests/backup_server.pp
+++ b/modules/openstack_project/manifests/backup_server.pp
@@ -1,9 +1,6 @@
 # == Class: openstack_project::backup_server
 #
 class openstack_project::backup_server {
-  class { 'openstack_project::template':
-    iptables_public_tcp_ports => [],
-  }
   package { 'bup':
     ensure => present,
   }
diff --git a/modules/openstack_project/manifests/lists.pp b/modules/openstack_project/manifests/lists.pp
index 7d181e4378..1d6bdd2614 100644
--- a/modules/openstack_project/manifests/lists.pp
+++ b/modules/openstack_project/manifests/lists.pp
@@ -4,13 +4,6 @@ class openstack_project::lists(
   $listadmins,
   $listpassword = ''
 ) {
-  # Using openstack_project::template instead of openstack_project::server
-  # because the exim config on this machine is almost certainly
-  # going to be more complicated than normal.
-  class { 'openstack_project::template':
-    iptables_public_tcp_ports => [25, 80, 465],
-  }
-
   $listdomain = 'lists.openstack.org'
 
   class { 'exim':
diff --git a/modules/openstack_project/manifests/puppetdb.pp b/modules/openstack_project/manifests/puppetdb.pp
index 4531cf2c7c..926de2501f 100644
--- a/modules/openstack_project/manifests/puppetdb.pp
+++ b/modules/openstack_project/manifests/puppetdb.pp
@@ -22,7 +22,7 @@ class openstack_project::puppetdb (
 
   class { 'puppetdb::database::postgresql':
     require         => [User['postgres'],
-      Class['openstack_project::template'],],
+      Class['openstack_project::server'],],
   }
 
   class { '::puppetdb::server':