diff --git a/playbooks/Octavia-DSVM/pre.yaml b/playbooks/Octavia-DSVM/pre.yaml
index 1e7987cf..3ab7e20d 100644
--- a/playbooks/Octavia-DSVM/pre.yaml
+++ b/playbooks/Octavia-DSVM/pre.yaml
@@ -2,6 +2,7 @@
   name: Octavia DSVM jobs pre-run playbook
   tasks:
     - shell:
+        executable: /bin/bash
         cmd: |
           set -e
           set -x
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e6e27014..d1414b18 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -51,6 +51,7 @@
 - job:
     name: octavia-dsvm-live-base
     parent: octavia-dsvm-base
+    timeout: 9000
     required-projects:
       - openstack/barbican
       - openstack/diskimage-builder
@@ -107,7 +108,7 @@
 
 - job:
     name: octavia-v2-dsvm-scenario
-    parent: octavia-dsvm-base
+    parent: octavia-dsvm-live-base
     vars:
       devstack_local_conf:
         post-config:
@@ -125,7 +126,7 @@
       devstack_localrc:
         USE_PYTHON3: true
 - job:
-    name: octavia-v2-dsvm-scenario-centos.7
+    name: octavia-v2-dsvm-scenario-centos-7
     parent: octavia-v2-dsvm-scenario
     nodeset: devstack-single-node-centos-7
     vars:
@@ -135,7 +136,7 @@
         OCTAVIA_AMP_IMAGE_SIZE: 3
 
 - job:
-    name: octavia-v2-dsvm-scenario-ubuntu.bionic
+    name: octavia-v2-dsvm-scenario-ubuntu-bionic
     parent: octavia-v2-dsvm-scenario
     vars:
       devstack_localrc:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index a2def366..2064db5f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -11,8 +11,8 @@
         - octavia-v2-dsvm-noop-py35-api
         - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-py35-scenario
-        - octavia-v2-dsvm-scenario-centos.7
-        - octavia-v2-dsvm-scenario-ubuntu.bionic:
+        - octavia-v2-dsvm-scenario-centos-7
+        - octavia-v2-dsvm-scenario-ubuntu-bionic:
             voting: false
     gate:
       queue: octavia
@@ -21,4 +21,4 @@
         - octavia-v2-dsvm-noop-py35-api
         - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-py35-scenario
-        - octavia-v2-dsvm-scenario-centos.7
+        - octavia-v2-dsvm-scenario-centos-7