diff --git a/modules.env b/modules.env
index 9d843dcc61..bc2255f3b1 100644
--- a/modules.env
+++ b/modules.env
@@ -32,7 +32,6 @@ SOURCE_MODULES["https://github.com/dalen/puppet-dnsquery"]="2.0.1"
 SOURCE_MODULES["https://github.com/duritong/puppet-sysctl"]="v0.0.11"
 # initfact is a dep of biemond-wildfly
 SOURCE_MODULES["https://github.com/jethrocarr/puppet-initfact"]="1.0.1"
-SOURCE_MODULES["https://github.com/jfryman/puppet-selinux"]="v0.2.5"
 SOURCE_MODULES["https://github.com/maestrodev/puppet-wget"]="v1.6.0"
 SOURCE_MODULES["https://github.com/n1tr0g/golja-gnupg"]="1.2.2"
 SOURCE_MODULES["https://github.com/nanliu/puppet-staging"]="1.0.1"
@@ -40,11 +39,9 @@ SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apache"]="1.11.1"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apt"]="2.4.0"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-concat"]="1.2.5"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-firewall"]="1.1.3"
-SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-haproxy"]="1.5.0"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-inifile"]="1.1.3"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-java_ks"]="1.3.1"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-mysql"]="3.11.0"
-SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-ntp"]="3.2.1"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-postgresql"]="4.8.0"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-rabbitmq"]="5.2.3"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-stdlib"]="4.17.0"
@@ -61,17 +58,13 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"
 
 # Add modules that should be part of the openstack-infra integration test here
 # Please keep sorted
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-askbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bup"]="origin/master"
-# Remove when we convert nb03 to ansible/docker
 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-haveged"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-httpd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jeepyb"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kibana"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-lodgeit"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-log_processor"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logrotate"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-logstash"]="origin/master"
@@ -83,12 +76,10 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstackid"]="origin/ma
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pgsql_backup"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pip"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-project_config"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ptgbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-redis"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-reviewday"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-simpleproxy"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ssh"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-statusbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-storyboard"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-subunit2sql"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-tmpreaper"]="origin/master"
diff --git a/zuul.d/puppet.yaml b/zuul.d/puppet.yaml
index 59ead05cfd..81ee2f9d8d 100644
--- a/zuul.d/puppet.yaml
+++ b/zuul.d/puppet.yaml
@@ -10,19 +10,16 @@
       - opendev/system-config
       - opendev/ansible-role-puppet
       - opendev/puppet-apparmor
-      - opendev/puppet-askbot
       - opendev/puppet-bugdaystats
       - opendev/puppet-bup
       - opendev/puppet-ciwatch
       - opendev/puppet-elastic_recheck
       - opendev/puppet-elasticsearch
       - opendev/puppet-ethercalc
-      - opendev/puppet-haveged
       - opendev/puppet-httpd
       - opendev/puppet-infra-cookiecutter
       - opendev/puppet-jeepyb
       - opendev/puppet-kibana
-      - opendev/puppet-lodgeit
       - opendev/puppet-log_processor
       - opendev/puppet-logrotate
       - opendev/puppet-logstash
@@ -35,13 +32,11 @@
       - opendev/puppet-pgsql_backup
       - opendev/puppet-pip
       - opendev/puppet-project_config
-      - opendev/puppet-ptgbot
       - opendev/puppet-puppet
       - opendev/puppet-redis
       - opendev/puppet-reviewday
       - opendev/puppet-simpleproxy
       - opendev/puppet-ssh
-      - opendev/puppet-statusbot
       - opendev/puppet-storyboard
       - opendev/puppet-subunit2sql
       - opendev/puppet-tmpreaper
@@ -110,10 +105,8 @@
       - opendev/puppet-reviewday
       - opendev/puppet-kibana
       - opendev/puppet-redis
-      - opendev/puppet-haveged
       - opendev/puppet-zanata
       - opendev/puppet-logstash
-      - opendev/puppet-statusbot
       - opendev/puppet-mediawiki
       - opendev/puppet-tmpreaper
       - opendev/puppet-elastic_recheck
@@ -122,16 +115,13 @@
       - opendev/puppet-elasticsearch
       - opendev/puppet-storyboard
       - opendev/puppet-openstack_health
-      - opendev/puppet-askbot
       - opendev/puppet-log_processor
       - opendev/puppet-simpleproxy
-      - opendev/puppet-lodgeit
       - opendev/puppet-bup
       - opendev/puppet-pgsql_backup
       - opendev/puppet-ssh
       - opendev/puppet-user
       - opendev/puppet-jeepyb
-      - opendev/puppet-ptgbot
       - opendev/puppet-vcsrepo
 
 - job: