diff --git a/doc/source/irc.rst b/doc/source/irc.rst
index fcdcb27472..dd0a051258 100644
--- a/doc/source/irc.rst
+++ b/doc/source/irc.rst
@@ -19,7 +19,6 @@ At a Glance
 :Puppet:
   * https://opendev.org/opendev/puppet-meetbot
   * https://opendev.org/opendev/puppet-statusbot
-  * https://opendev.org/opendev/puppet-gerritbot
   * https://opendev.org/opendev/puppet-ptgbot
   * :git_file:`modules/openstack_project/manifests/eavesdrop.pp`
   * :git_file:`modules/openstack_project/manifests/review.pp`
diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst
index b52771ee80..fe0093989e 100644
--- a/doc/source/nodepool.rst
+++ b/doc/source/nodepool.rst
@@ -23,7 +23,6 @@ At a Glance
   * zk02.openstack.org
   * zk03.openstack.org
 :Puppet:
-  * https://opendev.org/opendev/puppet-openstackci/src/branch/master/manifests/nodepool_launcher.pp
   * https://opendev.org/opendev/puppet-openstackci/src/branch/master/manifests/nodepool_builder.pp
 :Configuration:
   * :config:`nodepool/nodepool.yaml`
diff --git a/doc/source/zuul.rst b/doc/source/zuul.rst
index c77fc945c0..10c63414c3 100644
--- a/doc/source/zuul.rst
+++ b/doc/source/zuul.rst
@@ -16,10 +16,6 @@ At a Glance
   * zuul*.openstack.org
   * ze*.openstack.org
   * zm*.openstack.org
-:Puppet:
-  * https://opendev.org/opendev/puppet-zuul
-  * https://opendev.org/opendev/puppet-openstackci/src/branch/master/manifests/zuul_merger.pp
-  * https://opendev.org/opendev/puppet-openstackci/src/branch/master/manifests/zuul_scheduler.pp
 :Configuration:
   * :config:`zuul/main.yaml`
   * :config:`zuul.d`
diff --git a/modules.env b/modules.env
index fd7ed0a99c..294065feb3 100644
--- a/modules.env
+++ b/modules.env
@@ -66,21 +66,16 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ansible"]="origin/master
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-askbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-asterisk"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bup"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-cgit"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-diskimage_builder"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elastic_recheck"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elasticsearch"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ethercalc"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-exim"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-germqtt"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-gerritbot"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-github"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-grafyaml"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-graphite"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-haveged"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-hound"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-httpd"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-iptables"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jeepyb"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jenkins"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kerberos"]="origin/master"
@@ -101,10 +96,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openafs"]="origin/master
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstack_health"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstackci"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstackid"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-os_client_config"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-packagekit"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pgsql_backup"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-phabricator"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pip"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-planet"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-project_config"]="origin/master"
diff --git a/zuul.d/puppet.yaml b/zuul.d/puppet.yaml
index 3a5eb80ff8..9711c95295 100644
--- a/zuul.d/puppet.yaml
+++ b/zuul.d/puppet.yaml
@@ -16,27 +16,18 @@
       - opendev/puppet-bandersnatch
       - opendev/puppet-bugdaystats
       - opendev/puppet-bup
-      - opendev/puppet-cgit
       - opendev/puppet-ciwatch
       - opendev/puppet-diskimage_builder
       - opendev/puppet-elastic_recheck
       - opendev/puppet-elasticsearch
       - opendev/puppet-ethercalc
-      - opendev/puppet-etherpad_lite
-      - opendev/puppet-exim
       - opendev/puppet-germqtt
-      - opendev/puppet-gerrit
-      - opendev/puppet-gerritbot
-      - opendev/puppet-github
       - opendev/puppet-grafyaml
       - opendev/puppet-graphite
       - opendev/puppet-haveged
       - opendev/puppet-hound
       - opendev/puppet-httpd
-      - opendev/puppet-infracloud
       - opendev/puppet-infra-cookiecutter
-      - opendev/puppet-ipsilon
-      - opendev/puppet-iptables
       - opendev/puppet-jeepyb
       - opendev/puppet-jenkins
       - opendev/puppet-kerberos
@@ -58,10 +49,7 @@
       - opendev/puppet-openstack_health
       - opendev/puppet-openstackid
       - opendev/puppet-openstack_infra_spec_helper
-      - opendev/puppet-os_client_config
-      - opendev/puppet-packagekit
       - opendev/puppet-pgsql_backup
-      - opendev/puppet-phabricator
       - opendev/puppet-pip
       - opendev/puppet-planet
       - opendev/puppet-project_config
@@ -125,13 +113,11 @@
       - opendev/puppet-meetbot
       - opendev/puppet-hound
       - opendev/puppet-pip
-      - opendev/puppet-os_client_config
       - opendev/puppet-openstackid
       - opendev/puppet-bandersnatch
       - opendev/puppet-project_config
       - opendev/puppet-grafyaml
       - opendev/puppet-refstack
-      - opendev/puppet-github
       - opendev/puppet-ethercalc
       - opendev/puppet-unattended_upgrades
       - opendev/puppet-openafs
@@ -140,32 +126,25 @@
       - opendev/puppet-reviewday
       - opendev/puppet-kibana
       - opendev/puppet-redis
-      - opendev/puppet-phabricator
       - opendev/puppet-ssl_cert_check
       - opendev/puppet-lpmqtt
       - opendev/puppet-germqtt
-      - opendev/puppet-cgit
-      - opendev/puppet-packagekit
       - opendev/puppet-haveged
       - opendev/puppet-graphite
       - opendev/puppet-diskimage_builder
       - opendev/puppet-sudoers
       - opendev/puppet-zanata
       - opendev/puppet-logstash
-      - opendev/puppet-gerritbot
       - opendev/puppet-asterisk
       - opendev/puppet-statusbot
-      - opendev/puppet-gerrit
       - opendev/puppet-mediawiki
       - opendev/puppet-mailman
-      - opendev/puppet-exim
       - opendev/puppet-tmpreaper
       - opendev/puppet-elastic_recheck
       - opendev/puppet-ulimit
       - opendev/puppet-planet
       - opendev/puppet-nodepool
       - opendev/puppet-logrotate
-      - opendev/puppet-infracloud
       - opendev/puppet-elasticsearch
       - opendev/puppet-unbound
       - opendev/puppet-storyboard
@@ -174,9 +153,7 @@
       - opendev/puppet-askbot
       - opendev/puppet-log_processor
       - opendev/puppet-simpleproxy
-      - opendev/puppet-iptables
       - opendev/puppet-lodgeit
-      - opendev/puppet-etherpad_lite
       - opendev/puppet-mosquitto
       - opendev/puppet-bup
       - opendev/puppet-pgsql_backup
@@ -197,16 +174,6 @@
     vars:
       puppet_version: 4
 
-- job:
-    name: system-config-openstackci-beaker-puppet-4
-    parent: system-config-puppet-beaker-rspec-infra
-    description: |
-      Run beaker-rspec functional tests with puppet 4 on Ubuntu Xenial for the
-      puppet-openstackci module.
-    vars:
-      project_src_dir: "{{ zuul.projects['opendev.org/opendev/puppet-openstackci'].src_dir }}"
-      puppet_version: 4
-
 - project-template:
     name: system-config-puppet-apply-jobs
     description: |
@@ -214,11 +181,9 @@
     check:
       jobs:
         - system-config-puppet-apply-4-ubuntu-xenial
-        - system-config-openstackci-beaker-puppet-4
     gate:
       jobs:
         - system-config-puppet-apply-4-ubuntu-xenial
-        - system-config-openstackci-beaker-puppet-4
 
 - project-template:
     name: system-config-puppet-beaker-jobs
@@ -244,24 +209,16 @@
       - opendev/puppet-bandersnatch
       - opendev/puppet-bugdaystats
       - opendev/puppet-bup
-      - opendev/puppet-cgit
       - opendev/puppet-diskimage_builder
       - opendev/puppet-elastic_recheck
       - opendev/puppet-elasticsearch
       - opendev/puppet-ethercalc
-      - opendev/puppet-etherpad_lite
-      - opendev/puppet-exim
       - opendev/puppet-germqtt
-      - opendev/puppet-gerrit
-      - opendev/puppet-gerritbot
-      - opendev/puppet-github
       - opendev/puppet-grafyaml
       - opendev/puppet-graphite
       - opendev/puppet-haveged
       - opendev/puppet-hound
       - opendev/puppet-httpd
-      - opendev/puppet-infracloud
-      - opendev/puppet-iptables
       - opendev/puppet-jeepyb
       - opendev/puppet-jenkins
       - opendev/puppet-kerberos
@@ -282,10 +239,7 @@
       - opendev/puppet-openstackci
       - opendev/puppet-openstack_health
       - opendev/puppet-openstackid
-      - opendev/puppet-os_client_config
-      - opendev/puppet-packagekit
       - opendev/puppet-pgsql_backup
-      - opendev/puppet-phabricator
       - opendev/puppet-pip
       - opendev/puppet-planet
       - opendev/puppet-project_config