diff --git a/manifests/site.pp b/manifests/site.pp
index 6b8fa01b37..aab57290ab 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -218,7 +218,7 @@ node 'static.openstack.org' {
 }
 
 node 'zuul.openstack.org' {
-  class { 'openstack_project::zuul':
+  class { 'openstack_project::zuul_prod':
     jenkins_host         => 'jenkins.openstack.org',
     jenkins_url          => 'https://jenkins.openstack.org',
     jenkins_user         => hiera('jenkins_api_user'),
diff --git a/modules/openstack_project/manifests/zuul_dev.pp b/modules/openstack_project/manifests/zuul_dev.pp
index af72378ebe..e2fe5fb3fa 100644
--- a/modules/openstack_project/manifests/zuul_dev.pp
+++ b/modules/openstack_project/manifests/zuul_dev.pp
@@ -1,4 +1,4 @@
-# == Class: openstack_project::zuul
+# == Class: openstack_project::zuul_dev
 #
 class openstack_project::zuul_dev(
   $vhost_name = $::fqdn,
diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul_prod.pp
similarity index 97%
rename from modules/openstack_project/manifests/zuul.pp
rename to modules/openstack_project/manifests/zuul_prod.pp
index fb6b6f6ded..c297c71938 100644
--- a/modules/openstack_project/manifests/zuul.pp
+++ b/modules/openstack_project/manifests/zuul_prod.pp
@@ -1,6 +1,6 @@
-# == Class: openstack_project::zuul
+# == Class: openstack_project::zuul_prod
 #
-class openstack_project::zuul(
+class openstack_project::zuul_prod(
   $vhost_name = $::fqdn,
   $jenkins_host = '',
   $jenkins_url = '',