diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 7895b7fb34..0079786b75 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -80,6 +80,11 @@
       - shell: "sudo apt-get install -y nodejs npm"
       - shell: "sudo ln /usr/bin/nodejs /usr/local/bin/node"
 
+- builder:
+    name: uninstall-puppet
+    builders:
+      - shell: "sudo apt-get remove -y --purge puppet"
+
 - builder:
     name: puppet-lint
     builders:
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 632134f990..1505a80a11 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
@@ -3,6 +3,7 @@
     node: '{node}'
 
     builders:
+      - uninstall-puppet
       - revoke-sudo
       - gerrit-git-prep
       - shell: |