diff --git a/manifests/site.pp b/manifests/site.pp
index 9deb195042..3eff6a29f4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -132,7 +132,7 @@ node 'jenkins.openstack.org' {
   }
   class { 'openstack_project::jenkins':
     project_config_repo     => 'https://git.openstack.org/openstack-infra/project-config',
-    jenkins_jobs_password   => hiera('jenkins_jobs_password', 'XXX'),
+    jenkins_password        => hiera('jenkins_jobs_password', 'XXX'),
     jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
     ssl_cert_file_contents  => hiera('jenkins_ssl_cert_file_contents', 'XXX'),
     ssl_key_file_contents   => hiera('jenkins_ssl_key_file_contents', 'XXX'),
@@ -155,7 +155,7 @@ node /^jenkins\d+\.openstack\.org$/ {
     puppetmaster_server       => 'puppetmaster.openstack.org',
   }
   class { 'openstack_project::jenkins':
-    jenkins_jobs_password   => hiera('jenkins_jobs_password', 'XXX'),
+    jenkins_password        => hiera('jenkins_jobs_password', 'XXX'),
     jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
     ssl_cert_file           => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
     ssl_key_file            => '/etc/ssl/private/ssl-cert-snakeoil.key',
diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp
index 1dab05bc9c..d012c34e63 100644
--- a/modules/openstack_project/manifests/jenkins.pp
+++ b/modules/openstack_project/manifests/jenkins.pp
@@ -2,11 +2,8 @@
 #
 class openstack_project::jenkins (
   $vhost_name = $::fqdn,
-  $jenkins_jobs_password = '',
-  $jenkins_jobs_username = 'gerrig', # This is not a typo, well it isn't anymore.
-  $jenkins_git_url = 'https://git.openstack.org/openstack-infra/jenkins-job-builder',
-  $jenkins_git_revision = 'master',
-  $manage_jenkins_jobs = true,
+  $jenkins_password = '',
+  $jenkins_username = 'gerrig', # This is not a typo, well it isn't anymore.
   $ssl_cert_file = '',
   $ssl_key_file = '',
   $ssl_chain_file = '/etc/ssl/certs/intermediate.pem',
@@ -16,6 +13,7 @@ class openstack_project::jenkins (
   $jenkins_ssh_public_key = $openstack_project::jenkins_ssh_key,
   $jenkins_ssh_private_key = '',
   $project_config_repo = '',
+  $project_config_base = '',
   $serveradmin = 'webmaster@openstack.org',
   $logo = 'openstack.png',
 ) inherits openstack_project {
@@ -48,23 +46,11 @@ class openstack_project::jenkins (
     ssl_chain_file_contents => $ssl_chain_file_contents,
     jenkins_ssh_private_key => $jenkins_ssh_private_key,
     jenkins_ssh_public_key  => $jenkins_ssh_public_key,
-  }
-
-  if $manage_jenkins_jobs == true {
-    class { 'project_config':
-      url  => $project_config_repo,
-    }
-
-    class { '::jenkins::job_builder':
-      jenkins_jobs_update_timeout => 1200,
-      url                         => "https://${vhost_name}/",
-      username                    => $jenkins_jobs_username,
-      password                    => $jenkins_jobs_password,
-      git_revision                => $jenkins_git_revision,
-      git_url                     => $jenkins_git_url,
-      config_dir                  =>
-        $::project_config::jenkins_job_builder_config_dir,
-      require                     => $::project_config::config_dir,
-    }
+    project_config_repo     => $project_config_repo,
+    project_config_base     => $project_config_base,
+    jenkins_username        => $jenkins_username,
+    jenkins_password        => $jenkins_password,
+    jenkins_url             => "https://${vhost_name}/",
+    manage_jenkins_jobs     => true,
   }
 }