diff --git a/playbooks/legacy/puppet-httpd-forge-upload/run.yaml b/playbooks/legacy/puppet-httpd-forge-upload/run.yaml
deleted file mode 100644
index a1ec6cf4..00000000
--- a/playbooks/legacy/puppet-httpd-forge-upload/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-puppet-httpd-forge-upload from old job puppet-httpd-forge-upload
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -x
-          sudo rm -f /etc/sudoers.d/zuul
-          # Prove that general sudo access is actually revoked
-          ! sudo -n true
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://opendev.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          cat > Rakefile << EOF
-          require 'puppet_blacksmith/rake_tasks'
-          EOF
-          TAG=${ZUUL_REF:10}
-          sed -i -e 's/  "version":.*/  "version": "'$TAG'",/' metadata.json
-          mkdir .bundled_gems
-          export GEM_HOME=`pwd`/.bundled_gems
-          gem install --no-ri --no-rdoc  puppetlabs_spec_helper puppet-blacksmith
-          rake module:push
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/puppet-storyboard-forge-upload/run.yaml b/playbooks/legacy/puppet-storyboard-forge-upload/run.yaml
deleted file mode 100644
index 892dbe32..00000000
--- a/playbooks/legacy/puppet-storyboard-forge-upload/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-puppet-storyboard-forge-upload from old job puppet-storyboard-forge-upload
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -x
-          sudo rm -f /etc/sudoers.d/zuul
-          # Prove that general sudo access is actually revoked
-          ! sudo -n true
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              https://opendev.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          cat > Rakefile << EOF
-          require 'puppet_blacksmith/rake_tasks'
-          EOF
-          TAG=${ZUUL_REF:10}
-          sed -i -e 's/  "version":.*/  "version": "'$TAG'",/' metadata.json
-          mkdir .bundled_gems
-          export GEM_HOME=`pwd`/.bundled_gems
-          gem install --no-ri --no-rdoc  puppetlabs_spec_helper puppet-blacksmith
-          rake module:push
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 348554ff..364df947 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -882,59 +882,6 @@
     branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
     nodeset: legacy-ubuntu-bionic-2-node
 
-- job:
-    name: legacy-puppet-openstack-integration
-    abstract: true
-    description: |
-      Base job for autoconverted legacy puppet-openstack-integration
-
-      This job runs provides the base required projects for
-      puppet-openstack-integration jobs.
-    nodeset: devstack-single-node
-    pre-run: playbooks/legacy/pre.yaml
-    required-projects:
-      - openstack/puppet-aodh
-      - openstack/puppet-barbican
-      - openstack/puppet-ceilometer
-      - openstack/puppet-ceph
-      - openstack/puppet-cinder
-      - openstack/puppet-cloudkitty
-      - openstack/puppet-congress
-      - openstack/puppet-designate
-      - openstack/puppet-ec2api
-      - openstack/puppet-glance
-      - openstack/puppet-gnocchi
-      - openstack/puppet-heat
-      - openstack/puppet-horizon
-      - openstack/puppet-ironic
-      - openstack/puppet-keystone
-      - openstack/puppet-manila
-      - openstack/puppet-mistral
-      - x/puppet-modulesync-configs
-      - openstack/puppet-monasca
-      - openstack/puppet-murano
-      - openstack/puppet-neutron
-      - openstack/puppet-nova
-      - openstack/puppet-octavia
-      - openstack/puppet-openstack-cookiecutter
-      - openstack/puppet-openstack-integration
-      - openstack/puppet-openstack_extras
-      - openstack/puppet-openstacklib
-      - openstack/puppet-oslo
-      - openstack/puppet-ovn
-      - openstack/puppet-panko
-      - openstack/puppet-qdr
-      - openstack/puppet-sahara
-      - openstack/puppet-swift
-      - openstack/puppet-tacker
-      - openstack/puppet-tempest
-      - openstack/puppet-trove
-      - openstack/puppet-vswitch
-      - openstack/puppet-vitrage
-      - openstack/puppet-watcher
-      - openstack/puppet-zaqar
-      - openstack/tempest-horizon
-
 - job:
     name: legacy-publish-openstack-artifacts
     abstract: true
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index e984b54a..3e5844b8 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -544,12 +544,6 @@
       - x/tap-as-a-service
       - openstack/tempest
 
-- job:
-    name: legacy-puppet-httpd-forge-upload
-    parent: legacy-base
-    run: playbooks/legacy/puppet-httpd-forge-upload/run.yaml
-    timeout: 1800
-
 - job:
     name: legacy-puppet-lint
     parent: legacy-base
@@ -588,12 +582,6 @@
     required-projects:
       - opendev/puppet-openstackci
 
-- job:
-    name: legacy-puppet-storyboard-forge-upload
-    parent: legacy-puppet-openstack-integration
-    run: playbooks/legacy/puppet-storyboard-forge-upload/run.yaml
-    timeout: 1800
-
 - job:
     name: legacy-sandbox-tag
     parent: legacy-base