diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index ad118b4271..ac3df80dc7 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -95,6 +95,23 @@ class openstack_project::server (
 
   include snmpd
 
+  # We don't like byobu
+  file { '/etc/profile.d/Z98-byobu.sh':
+    ensure => absent,
+  }
+
+  if $::osfamily == 'Debian' {
+    # Ubuntu installs their whoopsie package by default, but it eats through
+    # memory and we don't need it on servers
+    package { 'whoopsie':
+      ensure => absent,
+    }
+
+    package { 'popularity-contest':
+      ensure => absent,
+    }
+  }
+
   class { 'openstack_project::template':
     iptables_public_tcp_ports => $iptables_public_tcp_ports,
     iptables_public_udp_ports => $iptables_public_udp_ports,
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 93b0b7c932..21af27e913 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -105,11 +105,6 @@ class openstack_project::template (
     require => Package['rsyslog'],
   }
 
-  # We don't like byobu
-  file { '/etc/profile.d/Z98-byobu.sh':
-    ensure => absent,
-  }
-
   if $::osfamily == 'Debian' {
 
     # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
@@ -125,15 +120,6 @@ class openstack_project::template (
       require => Package['rsyslog'],
     }
 
-    # Ubuntu installs their whoopsie package by default, but it eats through
-    # memory and we don't need it on servers
-    package { 'whoopsie':
-      ensure => absent,
-    }
-
-    package { 'popularity-contest':
-      ensure => absent,
-    }
   }
 
   ###########################################################