diff --git a/manifests/cucumber.pp b/manifests/cucumber.pp
index 6c8678c..e2c6382 100644
--- a/manifests/cucumber.pp
+++ b/manifests/cucumber.pp
@@ -8,6 +8,9 @@ node default {
     include jenkins-ci_org
     include updates_jenkins-ci_org
 
+    include exim4-config::selfrouting
+    exim4-config::dkim {'cucumber': ; }
+
     class {
       'postgres' :
         version => '8.4';
@@ -152,12 +155,6 @@ node default {
         port   => 47278,
         action => 'accept';
     }
-
-    include exim4-config::selfrouting
-    exim4-config::dkim {
-    'cucumber':
-        ;
-    }
 }
 Exec {
     path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ]
diff --git a/manifests/eggplant.pp b/manifests/eggplant.pp
index c8f2822..eb64ce6 100644
--- a/manifests/eggplant.pp
+++ b/manifests/eggplant.pp
@@ -9,6 +9,9 @@ node default {
     include confluence
     include confluence-cache
 
+    include exim4-config::osuoslrelay
+    exim4-config::dkim {'eggplant': ; }
+
     firewall {
       '100 accept inbound HTTP requests' :
         proto  => 'tcp',