diff --git a/manifests/site.pp b/manifests/site.pp
index a96909f713..09cffb88ad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -234,11 +234,6 @@ node 'zuul.openstack.org' {
       'jenkins-dev.openstack.org',
     ],
   }
-  # co-host gearman-job-server
-  include gearman
-  class { 'gearman':
-    listen => '::',
-  }
 }
 
 # A bare machine, but with a jenkins user
diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul.pp
index d17b82321b..b2f71ee891 100644
--- a/modules/openstack_project/manifests/zuul.pp
+++ b/modules/openstack_project/manifests/zuul.pp
@@ -26,6 +26,11 @@ class openstack_project::zuul(
     sysadmins                 => $sysadmins,
   }
 
+  # co-host gearman-job-server
+  class { 'gearman':
+    listen => '::',
+  }
+
   class { '::zuul':
     vhost_name           => $vhost_name,
     jenkins_server       => $jenkins_url,