diff --git a/manifests/site.pp b/manifests/site.pp
index 70e166dee0..9f26a6e91a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -723,10 +723,11 @@ node 'kdc02.openstack.org' {
 node /^afsdb.*\.openstack\.org$/ {
   $group = "afsdb"
 
-  class { 'openstack_project::server':
+  class { 'openstack_project::template':
     iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007],
     sysadmins                 => hiera('sysadmins', []),
     afs                       => true,
+    manage_exim               => true,
   }
 
   include openstack_project::afsdb
@@ -736,10 +737,11 @@ node /^afsdb.*\.openstack\.org$/ {
 node /^afs.*\..*\.openstack\.org$/ {
   $group = "afs"
 
-  class { 'openstack_project::server':
+  class { 'openstack_project::template':
     iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007],
     sysadmins                 => hiera('sysadmins', []),
     afs                       => true,
+    manage_exim               => true,
   }
 
   include openstack_project::afsfs
diff --git a/modules/openstack_project/manifests/afsfs.pp b/modules/openstack_project/manifests/afsfs.pp
index 9bf14b4602..52dbcf6a0f 100644
--- a/modules/openstack_project/manifests/afsfs.pp
+++ b/modules/openstack_project/manifests/afsfs.pp
@@ -15,6 +15,6 @@ class openstack_project::afsfs (
         ip       => '23.253.200.228',
       },
     ],
-    require      => Class['Openstack_project::Server'],
+    require      => Class['Openstack_project::Template'],
   }
 }