diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index f2604a0317..cea7865370 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -38,10 +38,6 @@ function octavia_lib_install {
     fi
 }
 
-function install_diskimage_builder {
-    setup_dev_lib -bindep "diskimage-builder"
-}
-
 function set_octavia_worker_image_owner_id {
     image_id=$(openstack image list --property name=${OCTAVIA_AMP_IMAGE_NAME} -f value -c ID)
     owner_id=$(openstack image show ${image_id} -c owner -f value)
@@ -49,9 +45,6 @@ function set_octavia_worker_image_owner_id {
 }
 
 function build_octavia_worker_image {
-    # set up diskimage-builder if we need to
-    install_diskimage_builder
-
     # Pull in DIB local elements if they are defined in devstack
     if [ -n "$DIB_LOCAL_ELEMENTS" ]; then
         export DIB_LOCAL_ELEMENTS=$DIB_LOCAL_ELEMENTS
diff --git a/octavia/tests/contrib/gate_hook.sh b/octavia/tests/contrib/gate_hook.sh
index 850a263d06..b3e93e4b80 100755
--- a/octavia/tests/contrib/gate_hook.sh
+++ b/octavia/tests/contrib/gate_hook.sh
@@ -16,9 +16,6 @@ function load_conf_hook {
 
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican"$'\n'
 
-# Allow testing against diskimage-builder changes with depends-on
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT+=,diskimage-builder"$'\n'
-
 # Sort out our gate args
 . $(dirname "$0")/decode_args.sh
 
diff --git a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml b/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml
index 877ec22252..058972f1a7 100644
--- a/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml
+++ b/playbooks/legacy/octavia-v1-dsvm-py3x-scenario/run.yaml
@@ -40,7 +40,6 @@
           fi
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
           export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
           export PROJECTS="openstack/neutron-lbaas $PROJECTS"
           export PROJECTS="openstack/octavia-lib $PROJECTS"
diff --git a/playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml b/playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml
index e6003f8012..dd90f31047 100644
--- a/playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml
+++ b/playbooks/legacy/octavia-v1-dsvm-scenario/run.yaml
@@ -39,7 +39,6 @@
           fi
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
           export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
           export PROJECTS="openstack/neutron-lbaas $PROJECTS"
           export PROJECTS="openstack/octavia-lib $PROJECTS"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 46c07a8c4a..927c83b7f3 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -5,8 +5,6 @@
     required-projects:
       - openstack/devstack-gate
       - openstack/barbican
-      - name: openstack/diskimage-builder
-        override-checkout: 2.30.0
       - openstack/neutron-lbaas
       - openstack/octavia
       - openstack/octavia-lib
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index b239f5b8ee..23df13be9a 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -44,22 +44,13 @@
         - octavia-v1-dsvm-py3x-scenario
         - octavia-v2-dsvm-noop-api
         - octavia-v2-dsvm-noop-py2-api
-        - octavia-v2-dsvm-scenario:
-            required-projects:
-              - name: openstack/diskimage-builder
-                override-checkout: 2.30.0
+        - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-py2-scenario
         - octavia-v2-dsvm-py2-scenario-centos-7:
             voting: false
         - octavia-v2-dsvm-scenario-ubuntu-bionic:
-            required-projects:
-              - name: openstack/diskimage-builder
-                override-checkout: 2.30.0
             voting: false
         - octavia-v2-dsvm-scenario-two-node:
-            required-projects:
-              - name: openstack/diskimage-builder
-                override-checkout: 2.30.0
             voting: false
         - octavia-v2-dsvm-py2-scenario-two-node:
             voting: false
@@ -76,9 +67,6 @@
               - ^(test-|)requirements.txt$
               - ^tox.ini$
         - octavia-v2-dsvm-tls-barbican:
-            required-projects:
-              - name: openstack/diskimage-builder
-                override-checkout: 2.30.0
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -116,10 +104,7 @@
         - neutron-lbaasv2-dsvm-py3x-api
         - octavia-v2-dsvm-noop-api
         - octavia-v2-dsvm-noop-py2-api
-        - octavia-v2-dsvm-scenario:
-            required-projects:
-              - name: openstack/diskimage-builder
-                override-checkout: 2.30.0
+        - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-py2-scenario
     periodic:
       jobs: