diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 379392f6bb..8a078f45d4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -83,7 +83,20 @@ function build_octavia_worker_image {
         fi
         sudo mkdir -m755 ${dib_logs}
         sudo chown $STACK_USER ${dib_logs}
-        $OCTAVIA_DIR/diskimage-create/diskimage-create.sh -l ${dib_logs}/$(basename $OCTAVIA_AMP_IMAGE_FILE).log $octavia_dib_tracing_arg -o $OCTAVIA_AMP_IMAGE_FILE ${PARAM_OCTAVIA_AMP_BASE_OS:-} ${PARAM_OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID:-} ${PARAM_OCTAVIA_AMP_IMAGE_SIZE:-}
+        # Build amphora image with master DIB in a Python 3 virtual environment
+        (
+            DIB_VENV_DIR=$(mktemp -d)
+            DIB_GIT_DIR=/tmp/dib-octavia
+            python3 -m venv $DIB_VENV_DIR
+            export USE_PYTHON3=True
+            export PATH=$DIB_VENV_DIR/bin:$PATH
+            if ! [ -d $DIB_GIT_DIR ]; then
+                git clone ${GITREPO["diskimage-builder"]} $DIB_GIT_DIR
+            fi
+            (cd $REQUIREMENTS_DIR && git show origin/master:upper-constraints.txt) | sed '/diskimage-builder/d' > $DIB_VENV_DIR/u-c.txt
+            pip install -c $DIB_VENV_DIR/u-c.txt $DIB_GIT_DIR
+            $OCTAVIA_DIR/diskimage-create/diskimage-create.sh -l ${dib_logs}/$(basename $OCTAVIA_AMP_IMAGE_FILE).log $octavia_dib_tracing_arg -o $OCTAVIA_AMP_IMAGE_FILE ${PARAM_OCTAVIA_AMP_BASE_OS:-} ${PARAM_OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID:-} ${PARAM_OCTAVIA_AMP_IMAGE_SIZE:-}
+        )
     fi
     upload_image file://${OCTAVIA_AMP_IMAGE_FILE} $TOKEN
 
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 99b3f7569c..b252c4a3c1 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -40,8 +40,6 @@
               - ^doc/.*$
               - ^etc/.*$
               - ^releasenotes/.*$
-        - octavia-v1-dsvm-scenario
-        - octavia-v1-dsvm-py3x-scenario
         - octavia-v2-dsvm-noop-api
         - octavia-v2-dsvm-noop-py2-api
         - octavia-v2-dsvm-scenario:
@@ -83,6 +81,10 @@
               - ^octavia/tests/unit/.*$
               - ^releasenotes/.*$
             voting: false
+        - octavia-v1-dsvm-scenario:
+            voting: false
+        - octavia-v1-dsvm-py3x-scenario:
+            voting: false
     gate:
       queue: octavia
       jobs:
@@ -107,8 +109,6 @@
               - ^doc/.*$
               - ^etc/.*$
               - ^releasenotes/.*$
-        - octavia-v1-dsvm-scenario
-        - octavia-v1-dsvm-py3x-scenario
         - neutron-lbaasv2-dsvm-api
         - neutron-lbaasv2-dsvm-py3x-api
         - octavia-v2-dsvm-noop-api