diff --git a/playbooks/infra-puppet-apply/run.yaml b/playbooks/infra-puppet-apply/run.yaml
index 0122b6ff..874924dd 100644
--- a/playbooks/infra-puppet-apply/run.yaml
+++ b/playbooks/infra-puppet-apply/run.yaml
@@ -7,6 +7,6 @@
       args:
         chdir: "{{ zuul.projects['opendev.org/opendev/system-config'].src_dir }}"
       environment:
-        PUPPET_VERSION: "{{ puppet_version | default('3') }}"
+        PUPPET_VERSION: "{{ puppet_version | default('4') }}"
       tags:
         - skip_ansible_lint
diff --git a/playbooks/infra-puppet-beaker-rspec/run.yaml b/playbooks/infra-puppet-beaker-rspec/run.yaml
index 112805cd..5d9adb03 100644
--- a/playbooks/infra-puppet-beaker-rspec/run.yaml
+++ b/playbooks/infra-puppet-beaker-rspec/run.yaml
@@ -51,4 +51,4 @@
         chdir: "{{ project_src_dir }}"
       environment:
         'GEM_HOME': "{{ ansible_user_dir }}/.bundled_gems"
-        'PUPPET_VERSION': "{{ puppet_version | default('3') }}"
+        'PUPPET_VERSION': "{{ puppet_version | default('4') }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3f5c9924..66774227 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1452,17 +1452,6 @@
     run: playbooks/infra-puppet-apply/run.yaml
     post-run: playbooks/infra-puppet-apply/post.yaml
 
-- job:
-    name: infra-puppet-apply-3-ubuntu-xenial
-    parent: infra-puppet-apply-base
-    nodeset: ubuntu-xenial
-
-- job:
-    name: infra-puppet-apply-3-ubuntu-trusty
-    parent: infra-puppet-apply-base
-    nodeset: ubuntu-trusty
-    branches: master
-
 - job:
     name: infra-puppet-apply-4-ubuntu-xenial
     parent: infra-puppet-apply-base
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 983ba445..8544683e 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -1574,12 +1574,10 @@
       Runs puppet apply tests for OpenStack Infrastructure.
     check:
       jobs:
-        - infra-puppet-apply-3-ubuntu-xenial
         - infra-puppet-apply-4-ubuntu-xenial
         - openstackci-beaker-puppet-4
     gate:
       jobs:
-        - infra-puppet-apply-3-ubuntu-xenial
         - infra-puppet-apply-4-ubuntu-xenial
         - openstackci-beaker-puppet-4