diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 947e7fa..b56b25f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -6,102 +6,3 @@
       (The built-in noop job currently has a bug if a repo-state call
       is involved.)
     run: playbooks/noop.yaml
-
-- job:
-    name: opendev-build-diskimage-base
-    description: |
-      The abstract base job for building VM images used in OpenDev's Zuul
-
-      If the variable ``image_upload_secret`` is provided (as a
-      secret) this job will upload the resulting image (this should be
-      done in image build pipelines).  Otherwise, it will only build
-      the image without uploading it (this can be useful for check
-      pipelines).
-    parent: build-diskimage
-    timeout: 7200
-    post-timeout: 7200
-    abstract: true
-    pre-run:
-      - playbooks/opendev-build-diskimage-base/pre.yaml
-    post-run:
-      - playbooks/opendev-build-diskimage-base/post.yaml
-    files:
-      - 'dib-elements/.*'
-      - 'playbooks/opendev-build-diskimage-base/.*'
-      - 'roles/make-source-repositories-cache/.*'
-    vars:
-      # TODO(corvus): This will eventually be supplied by Zuul
-      build_diskimage_formats:
-        - qcow2
-        - raw
-      # /opt/dib_tmp is an ephemeral disk if present
-      build_diskimage_image_root: "/opt/dib_tmp/dib-images"
-      build_diskimage_elements: &base_elements
-        - vm
-        - simple-init
-        - openstack-repos
-        - nodepool-base
-        - growroot
-        - infra-package-needs
-      build_diskimage_environment:
-        TMPDIR: /opt/dib_tmp
-        ELEMENTS_PATH: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/opendev/zuul-jobs'].src_dir }}/dib-elements"
-        # TODO: Do we want streaming logs?
-        DIB_QUIET: '0'
-        DIB_NO_TMPFS: '1'
-        DIB_CHECKSUM: '1'
-        DIB_IMAGE_CACHE: /opt/dib_cache
-        DIB_JOURNAL_SIZE: '512'
-        DIB_GRUB_TIMEOUT: '0'
-        GIT_HTTP_LOW_SPEED_TIME: '300'
-        GIT_HTTP_LOW_SPEED_LIMIT: '1000'
-        DIB_SHOW_IMAGE_USAGE: '1'
-        ZUUL_USER_SSH_PUBLIC_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDh5u0DWNi0d3uqI82izAxVTUTrGl36L3szEqV9WrilGmxaTtp9X7HrktJ5J+rvxQqz39llTf1v7iYA4CNKto/48RBAB0mKEEI4x4iw+fu/BLU7nu7ewSfXLUxHahxaTgIk2KcbegknD5NzMjalyfNfgTPDGv8BjwHeeNdZmJMBvPFGu6fO48M4yK1tiQn0kAkaH4oII/M4pyF8vy9tPTODAD7RvnMvQAb08LZZvE/IPzJAHNXFRb1v+DBa38fOvdyaz/nibrsxiOWZxQVLgjYciUeDy1xvXADaWlqvxmLy+90LHbJFbGxK4AN0mWfwBiUMVyxZjkun39pjTNl2k09OhOq+R52UqnehMc4eBdZCddnCUq4/efbFCJkqe5wY+SE8fYybJjauUL64zyrwf6yfWkXvPVHWa9Y+NCmvH8PCBUcsQnwO7l/Yb4N+8+u6zkODyuc9wLAY+DpnptE3plXtvUs5negC4fvJSnOHpWXuoi9yzp7IlPf6fSjMMDQo0JjCYJwazdzqrIH2VSCcfHAqWF0ECR8IgwZV1bp0xFe0UN0Gjsgkozqf8rvs1AYyTSeD19Wg9j+crTke8E1sfoI/qFzHwzBQFKJ+2l0cs7pZWJBARlhbt1j1IouS2aH+74xwsavRhBz4IsFTPqWiP6JTrgk5cgKRnTqInzNfdaLeUw== zuul-worker@openstack.org"
-
-- job:
-    name: opendev-build-diskimage-base-debuntu
-    description: |
-      An abstract base job for building Debian or Ubuntu based VM images
-    parent: opendev-build-diskimage-base
-    abstract: true
-    vars:
-      build_diskimage_environment:
-        DIB_APT_LOCAL_CACHE: '0'
-        DIB_DISABLE_APT_CLEANUP: '1'
-        DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
-
-- job:
-    name: opendev-build-diskimage-debian-bullseye
-    description: |
-      Build the OpenDev Debian bullseye VM image
-    parent: opendev-build-diskimage-base-debuntu
-    image-build-name: debian-bullseye
-    vars:
-      build_diskimage_image_name: debian-bullseye
-      build_diskimage_elements:
-        - *base_elements
-        - debian-minimal
-        - cache-devstack
-      build_diskimage_environment:
-        DIB_RELEASE: 'bullseye'
-        DIB_DISTRIBUTION_MIRROR: 'https://{{ zuul_site_mirror_fqdn }}/debian'
-        DIB_DEBIAN_SECURITY_MIRROR:
-          'https://{{ zuul_site_mirror_fqdn }}/debian-security'
-        DIB_BLOCK_DEVICE_CONFIG: |
-          # Default single partition loopback
-          - local_loop:
-              name: image0
-  
-          - partitioning:
-              base: image0
-              label: mbr
-              partitions:
-                - name: root
-                  flags: [ boot, primary ]
-                  size: 100%
-                  mkfs:
-                    mount:
-                      mount_point: /
-                      fstab:
-                        options: "defaults,nobarrier,noatime"
-                        fsck-passno: 1
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7c3423a..60cb468 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,19 +2,6 @@
     check:
       jobs:
         - opendev-zuul-jobs-noop
-        - opendev-build-diskimage-debian-bullseye
     gate:
       jobs:
         - opendev-zuul-jobs-noop
-        - opendev-build-diskimage-debian-bullseye:
-            secrets:
-              - name: image_upload_secret
-                secret: image-upload-secret
-                pass-to-parent: true
-    image-build:
-      jobs:
-        - opendev-build-diskimage-debian-bullseye:
-            secrets:
-              - name: image_upload_secret
-                secret: image-upload-secret
-                pass-to-parent: true
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
deleted file mode 100644
index 22e2082..0000000
--- a/zuul.d/secrets.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-- secret:
-    name: image-upload-secret
-    data:
-      application_credential_id: !encrypted/pkcs1-oaep
-        - fi7BEoNigqqcbcvStKQ4TjoxX2uHJMKkYWr/6w5IPohQF0hjmBHP3KIyTKLIa9xwxysMJ
-          tbyvgoulFcYLOPBK1hpfIX4KX+L4MhBN6d5lqKxrxOElOJXdwwgSizNGP1nSIUmg+YYlD
-          JXGfk51EUmxYCAGGBfiNyhDMseC2zPKH813pvnrCL7pjRdA7uhDk7tsUAdpRSH/C5g0/G
-          gg39pHG7foNlVRGNmd5G/98NnyUfnWrKLxX3xjM/Q1CfZdgHp2k2lVyibspA+jw/B0rf6
-          TJC1gYBN7ARfTuzB5TM7OIdJJTEaF9D2oSnlof7wfEIXv0X3awXJ+TXjtFwlGhjyk1PLC
-          6HCp7yzSTXf9r8KIS5bofehiKI1lyrX5umzC+qF4F+N8GN3MKZV/hPoz8jLyrVVaQbZkD
-          g69R0byIHFL7FBzee1uGOWWUXJSXd77PmWlfvAaXSdfOfFYAJ0oihtWx+ZwosvxTpN4Rv
-          tjspmOMn2PPTvKwsjPLGetr24Y6m/6YtXiiR+FsCHi/Lu438kQmN8D7s4SJlNXwmne/7f
-          Q9zjqFxcx6ZIq+IVFL6QpphvBE0YtbU0Jkq1cXcsi71+DKcM0Kk0uOiikszO55I2HmYQN
-          HH99NCtlcWYK3yRhqg0nbEvxQ0oMPrsMQ65zuxI/8Ax4GFFGu2CfvGTN5peVLY=
-      application_credential_secret: !encrypted/pkcs1-oaep
-        - i0Pk1hkZPTEebz83pUmgncpBBESoAlcwj2AoEcpfvhMejxbWcrc/itBg/Tpv8T3QXAT0Y
-          zPn8ATFZZOKZjoGTW+RWXX/L7CrMZzo6hqtIyXZWgv7OCJv50zAOkRLFFbNEplJvzMHKU
-          GHJAkSMO9jXDvtgw8EjlC2APuVCudQ82TsUfdlYMSnz20jGPPgI52DJDYvHeV1m1yH/y0
-          uXp+mMM1Z6QbXtOiepxN9BJN3LzJWMZCqJVwL+q883czhF/6Ju+aCS2ebAzGJk/epnMh3
-          rMV6lWRYzNXdpBRCsiwAe1UR3XBh0gfPPWw7h9jlOyPgAlHRxqpuivbMAH8InGJitqAP1
-          xJkDwViV172H+ZLMQjkiu6jSdhIJf/saA+BCHv5qjXbdhoH07Syv6CpSeb5yqLUix08y4
-          MTadWAGzfUm57XdvHjskSV8zJzrEb6Uao3C9mOTn7c5OVhJZ8h3QEjhYONg+ZliRawull
-          WY6G7EbQ2VFNvPs4xUf9AOwaRwNl6bYbhjCoH50S2G0n24Vt1Y8oogSoxHeaULHLuBlnZ
-          JI5eUvwZwa6ByeLJ6YMxN8nUuW+8jWCjlN7x4rGDpZMkNvlO1Mtx8/gpetBYv7EbdeJN3
-          Dyv2odY9ME+LN0TGLJBpCPZM2wO77PlGwyJ6Xk2fHLOW4AV7ubzW7wJ8qRMzyY=