diff --git a/hiera/common.yaml b/hiera/common.yaml
index ffb3c104d6..f335f97751 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -294,8 +294,6 @@ cacti_hosts:
 - health.openstack.org
 - jenkins-dev.openstack.org
 - jenkins.openstack.org
-- jenkins03.openstack.org
-- jenkins04.openstack.org
 - jenkins05.openstack.org
 - jenkins06.openstack.org
 - jenkins07.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index a94d24d6c7..df3e390038 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -781,20 +781,6 @@ node 'nodepool.openstack.org' {
     builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb',
     upload_workers                => '16',
     jenkins_masters               => [
-      {
-        name        => 'jenkins03',
-        url         => 'https://jenkins03.openstack.org/',
-        user        => hiera('jenkins_api_user', 'username'),
-        apikey      => hiera('jenkins_api_key'),
-        credentials => hiera('jenkins_credentials_id'),
-      },
-      {
-        name        => 'jenkins04',
-        url         => 'https://jenkins04.openstack.org/',
-        user        => hiera('jenkins_api_user', 'username'),
-        apikey      => hiera('jenkins_api_key'),
-        credentials => hiera('jenkins_credentials_id'),
-      },
       {
         name        => 'jenkins05',
         url         => 'https://jenkins05.openstack.org/',
@@ -855,8 +841,6 @@ node 'zuul.openstack.org' {
     gearman_workers                => [
       'nodepool.openstack.org',
       'jenkins.openstack.org',
-      'jenkins03.openstack.org',
-      'jenkins04.openstack.org',
       'jenkins05.openstack.org',
       'jenkins06.openstack.org',
       'jenkins07.openstack.org',
@@ -959,8 +943,6 @@ node 'zuul-dev.openstack.org' {
     statsd_host          => 'graphite.openstack.org',
     gearman_workers      => [
       'jenkins.openstack.org',
-      'jenkins03.openstack.org',
-      'jenkins04.openstack.org',
       'jenkins05.openstack.org',
       'jenkins06.openstack.org',
       'jenkins07.openstack.org',
diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
index dc4684c6aa..15271b0a23 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -3,8 +3,6 @@ source-url: http://logs.openstack.org
 # List of zmq event inputs.
 zmq-publishers:
   - tcp://jenkins.openstack.org:8888
-  - tcp://jenkins03.openstack.org:8888
-  - tcp://jenkins04.openstack.org:8888
   - tcp://jenkins05.openstack.org:8888
   - tcp://jenkins06.openstack.org:8888
   - tcp://jenkins07.openstack.org:8888