diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
index 3367d7af68..78055cd96c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
@@ -40,7 +40,6 @@
     name: 'puppet-module-unit'
     puppet_version:
       - 2.7
-      - 3.0
       - 3.1
       - 3.2
       - 3.3
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 5ef6d29d93..fad84c7996 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -462,8 +462,6 @@ jobs:
     voting: false
   - name: gate-puppet-vswitch-puppet-syntax
     voting: false
-  - name: ^gate-puppet-.*-puppet-unit-3.0$
-    voting: false
   - name: gate-tomograph-python33
     voting: false
 
@@ -3434,7 +3432,6 @@ projects:
       - gate-puppet-ceilometer-puppet-lint
       - gate-puppet-ceilometer-puppet-syntax
       - gate-puppet-ceilometer-puppet-unit-2.7
-      - gate-puppet-ceilometer-puppet-unit-3.0
       - gate-puppet-ceilometer-puppet-unit-3.1
       - gate-puppet-ceilometer-puppet-unit-3.2
       - gate-puppet-ceilometer-puppet-unit-3.3
@@ -3443,7 +3440,6 @@ projects:
       - gate-puppet-ceilometer-puppet-lint
       - gate-puppet-ceilometer-puppet-syntax
       - gate-puppet-ceilometer-puppet-unit-2.7
-      - gate-puppet-ceilometer-puppet-unit-3.0
       - gate-puppet-ceilometer-puppet-unit-3.1
       - gate-puppet-ceilometer-puppet-unit-3.2
       - gate-puppet-ceilometer-puppet-unit-3.3
@@ -3454,13 +3450,11 @@ projects:
       - gate-puppet-ceph-puppet-lint
       - gate-puppet-ceph-puppet-syntax
       - gate-puppet-ceph-puppet-unit-2.7
-      - gate-puppet-ceph-puppet-unit-3.0
       - gate-puppet-ceph-puppet-unit-3.1
     gate:
       - gate-puppet-ceph-puppet-lint
       - gate-puppet-ceph-puppet-syntax
       - gate-puppet-ceph-puppet-unit-2.7
-      - gate-puppet-ceph-puppet-unit-3.0
       - gate-puppet-ceph-puppet-unit-3.1
 
   - name: stackforge/puppet-cinder
@@ -3468,7 +3462,6 @@ projects:
       - gate-puppet-cinder-puppet-lint
       - gate-puppet-cinder-puppet-syntax
       - gate-puppet-cinder-puppet-unit-2.7
-      - gate-puppet-cinder-puppet-unit-3.0
       - gate-puppet-cinder-puppet-unit-3.1
       - gate-puppet-cinder-puppet-unit-3.2
       - gate-puppet-cinder-puppet-unit-3.3
@@ -3477,7 +3470,6 @@ projects:
       - gate-puppet-cinder-puppet-lint
       - gate-puppet-cinder-puppet-syntax
       - gate-puppet-cinder-puppet-unit-2.7
-      - gate-puppet-cinder-puppet-unit-3.0
       - gate-puppet-cinder-puppet-unit-3.1
       - gate-puppet-cinder-puppet-unit-3.2
       - gate-puppet-cinder-puppet-unit-3.3
@@ -3488,7 +3480,6 @@ projects:
       - gate-puppet-designate-puppet-lint
       - gate-puppet-designate-puppet-syntax
       - gate-puppet-designate-puppet-unit-2.7
-      - gate-puppet-designate-puppet-unit-3.0
       - gate-puppet-designate-puppet-unit-3.1
       - gate-puppet-designate-puppet-unit-3.2
       - gate-puppet-designate-puppet-unit-3.3
@@ -3497,7 +3488,6 @@ projects:
       - gate-puppet-designate-puppet-lint
       - gate-puppet-designate-puppet-syntax
       - gate-puppet-designate-puppet-unit-2.7
-      - gate-puppet-designate-puppet-unit-3.0
       - gate-puppet-designate-puppet-unit-3.1
       - gate-puppet-designate-puppet-unit-3.2
       - gate-puppet-designate-puppet-unit-3.3
@@ -3508,7 +3498,6 @@ projects:
       - gate-puppet-glance-puppet-lint
       - gate-puppet-glance-puppet-syntax
       - gate-puppet-glance-puppet-unit-2.7
-      - gate-puppet-glance-puppet-unit-3.0
       - gate-puppet-glance-puppet-unit-3.1
       - gate-puppet-glance-puppet-unit-3.2
       - gate-puppet-glance-puppet-unit-3.3
@@ -3517,7 +3506,6 @@ projects:
       - gate-puppet-glance-puppet-lint
       - gate-puppet-glance-puppet-syntax
       - gate-puppet-glance-puppet-unit-2.7
-      - gate-puppet-glance-puppet-unit-3.0
       - gate-puppet-glance-puppet-unit-3.1
       - gate-puppet-glance-puppet-unit-3.2
       - gate-puppet-glance-puppet-unit-3.3
@@ -3528,7 +3516,6 @@ projects:
       - gate-puppet-heat-puppet-lint
       - gate-puppet-heat-puppet-syntax
       - gate-puppet-heat-puppet-unit-2.7
-      - gate-puppet-heat-puppet-unit-3.0
       - gate-puppet-heat-puppet-unit-3.1
       - gate-puppet-heat-puppet-unit-3.2
       - gate-puppet-heat-puppet-unit-3.3
@@ -3537,7 +3524,6 @@ projects:
       - gate-puppet-heat-puppet-lint
       - gate-puppet-heat-puppet-syntax
       - gate-puppet-heat-puppet-unit-2.7
-      - gate-puppet-heat-puppet-unit-3.0
       - gate-puppet-heat-puppet-unit-3.1
       - gate-puppet-heat-puppet-unit-3.2
       - gate-puppet-heat-puppet-unit-3.3
@@ -3548,7 +3534,6 @@ projects:
       - gate-puppet-horizon-puppet-lint
       - gate-puppet-horizon-puppet-syntax
       - gate-puppet-horizon-puppet-unit-2.7
-      - gate-puppet-horizon-puppet-unit-3.0
       - gate-puppet-horizon-puppet-unit-3.1
       - gate-puppet-horizon-puppet-unit-3.2
       - gate-puppet-horizon-puppet-unit-3.3
@@ -3557,7 +3542,6 @@ projects:
       - gate-puppet-horizon-puppet-lint
       - gate-puppet-horizon-puppet-syntax
       - gate-puppet-horizon-puppet-unit-2.7
-      - gate-puppet-horizon-puppet-unit-3.0
       - gate-puppet-horizon-puppet-unit-3.1
       - gate-puppet-horizon-puppet-unit-3.2
       - gate-puppet-horizon-puppet-unit-3.3
@@ -3568,7 +3552,6 @@ projects:
       - gate-puppet-ironic-puppet-lint
       - gate-puppet-ironic-puppet-syntax
       - gate-puppet-ironic-puppet-unit-2.7
-      - gate-puppet-ironic-puppet-unit-3.0
       - gate-puppet-ironic-puppet-unit-3.1
       - gate-puppet-ironic-puppet-unit-3.2
       - gate-puppet-ironic-puppet-unit-3.3
@@ -3577,7 +3560,6 @@ projects:
       - gate-puppet-ironic-puppet-lint
       - gate-puppet-ironic-puppet-syntax
       - gate-puppet-ironic-puppet-unit-2.7
-      - gate-puppet-ironic-puppet-unit-3.0
       - gate-puppet-ironic-puppet-unit-3.1
       - gate-puppet-ironic-puppet-unit-3.2
       - gate-puppet-ironic-puppet-unit-3.3
@@ -3588,7 +3570,6 @@ projects:
       - gate-puppet-keystone-puppet-lint
       - gate-puppet-keystone-puppet-syntax
       - gate-puppet-keystone-puppet-unit-2.7
-      - gate-puppet-keystone-puppet-unit-3.0
       - gate-puppet-keystone-puppet-unit-3.1
       - gate-puppet-keystone-puppet-unit-3.2
       - gate-puppet-keystone-puppet-unit-3.3
@@ -3597,7 +3578,6 @@ projects:
       - gate-puppet-keystone-puppet-lint
       - gate-puppet-keystone-puppet-syntax
       - gate-puppet-keystone-puppet-unit-2.7
-      - gate-puppet-keystone-puppet-unit-3.0
       - gate-puppet-keystone-puppet-unit-3.1
       - gate-puppet-keystone-puppet-unit-3.2
       - gate-puppet-keystone-puppet-unit-3.3
@@ -3608,7 +3588,6 @@ projects:
       - gate-puppet-neutron-puppet-lint
       - gate-puppet-neutron-puppet-syntax
       - gate-puppet-neutron-puppet-unit-2.7
-      - gate-puppet-neutron-puppet-unit-3.0
       - gate-puppet-neutron-puppet-unit-3.1
       - gate-puppet-neutron-puppet-unit-3.2
       - gate-puppet-neutron-puppet-unit-3.3
@@ -3617,7 +3596,6 @@ projects:
       - gate-puppet-neutron-puppet-lint
       - gate-puppet-neutron-puppet-syntax
       - gate-puppet-neutron-puppet-unit-2.7
-      - gate-puppet-neutron-puppet-unit-3.0
       - gate-puppet-neutron-puppet-unit-3.1
       - gate-puppet-neutron-puppet-unit-3.2
       - gate-puppet-neutron-puppet-unit-3.3
@@ -3628,7 +3606,6 @@ projects:
       - gate-puppet-nova-puppet-lint
       - gate-puppet-nova-puppet-syntax
       - gate-puppet-nova-puppet-unit-2.7
-      - gate-puppet-nova-puppet-unit-3.0
       - gate-puppet-nova-puppet-unit-3.1
       - gate-puppet-nova-puppet-unit-3.2
       - gate-puppet-nova-puppet-unit-3.3
@@ -3637,7 +3614,6 @@ projects:
       - gate-puppet-nova-puppet-lint
       - gate-puppet-nova-puppet-syntax
       - gate-puppet-nova-puppet-unit-2.7
-      - gate-puppet-nova-puppet-unit-3.0
       - gate-puppet-nova-puppet-unit-3.1
       - gate-puppet-nova-puppet-unit-3.2
       - gate-puppet-nova-puppet-unit-3.3
@@ -3648,7 +3624,6 @@ projects:
       - gate-puppet-openstack-puppet-lint
       - gate-puppet-openstack-puppet-syntax
       - gate-puppet-openstack-puppet-unit-2.7
-      - gate-puppet-openstack-puppet-unit-3.0
       - gate-puppet-openstack-puppet-unit-3.1
       - gate-puppet-openstack-puppet-unit-3.2
       - gate-puppet-openstack-puppet-unit-3.3
@@ -3657,7 +3632,6 @@ projects:
       - gate-puppet-openstack-puppet-lint
       - gate-puppet-openstack-puppet-syntax
       - gate-puppet-openstack-puppet-unit-2.7
-      - gate-puppet-openstack-puppet-unit-3.0
       - gate-puppet-openstack-puppet-unit-3.1
       - gate-puppet-openstack-puppet-unit-3.2
       - gate-puppet-openstack-puppet-unit-3.3
@@ -3680,7 +3654,6 @@ projects:
       - gate-puppet-savanna-puppet-lint
       - gate-puppet-savanna-puppet-syntax
       - gate-puppet-savanna-puppet-unit-2.7
-      - gate-puppet-savanna-puppet-unit-3.0
       - gate-puppet-savanna-puppet-unit-3.1
       - gate-puppet-savanna-puppet-unit-3.2
       - gate-puppet-savanna-puppet-unit-3.3
@@ -3689,7 +3662,6 @@ projects:
       - gate-puppet-savanna-puppet-lint
       - gate-puppet-savanna-puppet-syntax
       - gate-puppet-savanna-puppet-unit-2.7
-      - gate-puppet-savanna-puppet-unit-3.0
       - gate-puppet-savanna-puppet-unit-3.1
       - gate-puppet-savanna-puppet-unit-3.2
       - gate-puppet-savanna-puppet-unit-3.3
@@ -3700,7 +3672,6 @@ projects:
       - gate-puppet-swift-puppet-lint
       - gate-puppet-swift-puppet-syntax
       - gate-puppet-swift-puppet-unit-2.7
-      - gate-puppet-swift-puppet-unit-3.0
       - gate-puppet-swift-puppet-unit-3.1
       - gate-puppet-swift-puppet-unit-3.2
       - gate-puppet-swift-puppet-unit-3.3
@@ -3709,7 +3680,6 @@ projects:
       - gate-puppet-swift-puppet-lint
       - gate-puppet-swift-puppet-syntax
       - gate-puppet-swift-puppet-unit-2.7
-      - gate-puppet-swift-puppet-unit-3.0
       - gate-puppet-swift-puppet-unit-3.1
       - gate-puppet-swift-puppet-unit-3.2
       - gate-puppet-swift-puppet-unit-3.3
@@ -3720,7 +3690,6 @@ projects:
       - gate-puppet-tempest-puppet-lint
       - gate-puppet-tempest-puppet-syntax
       - gate-puppet-tempest-puppet-unit-2.7
-      - gate-puppet-tempest-puppet-unit-3.0
       - gate-puppet-tempest-puppet-unit-3.1
       - gate-puppet-tempest-puppet-unit-3.2
       - gate-puppet-tempest-puppet-unit-3.3
@@ -3729,7 +3698,6 @@ projects:
       - gate-puppet-tempest-puppet-lint
       - gate-puppet-tempest-puppet-syntax
       - gate-puppet-tempest-puppet-unit-2.7
-      - gate-puppet-tempest-puppet-unit-3.0
       - gate-puppet-tempest-puppet-unit-3.1
       - gate-puppet-tempest-puppet-unit-3.2
       - gate-puppet-tempest-puppet-unit-3.3
@@ -3740,11 +3708,9 @@ projects:
       - gate-puppet-vswitch-puppet-lint
       - gate-puppet-vswitch-puppet-syntax
       - gate-puppet-vswitch-puppet-unit-2.7
-      - gate-puppet-vswitch-puppet-unit-3.0
       - gate-puppet-vswitch-puppet-unit-3.1
     gate:
       - gate-puppet-vswitch-puppet-unit-2.7
-      - gate-puppet-vswitch-puppet-unit-3.0
       - gate-puppet-vswitch-puppet-unit-3.1
 
   - name: stackforge/pycadf