diff --git a/.zuul.yaml b/.zuul.yaml
index 1c774c2f..d1b781e1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -140,9 +140,9 @@
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: stable-2.9
-      - # Choose parent devstack job from master branch instead of non-existing stable/1.0.0 branch
+      - # Choose parent devstack job from stable/yoga branch instead of non-existing stable/1.0.0 branch
         name: openstack/devstack
-        override-checkout: master
+        override-checkout: stable/yoga
       - name: openstack/openstacksdk
         # Yoga has the latest SDK release of the 0.*.* series atm
         override-checkout: stable/yoga
@@ -159,9 +159,9 @@
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: stable-2.11
-      - # Choose parent devstack job from master branch instead of non-existing stable/1.0.0 branch
+      - # Choose parent devstack job from stable/yoga branch instead of non-existing stable/1.0.0 branch
         name: openstack/devstack
-        override-checkout: master
+        override-checkout: stable/yoga
       - name: openstack/openstacksdk
         # Yoga has the latest SDK release of the 0.*.* series atm
         override-checkout: stable/yoga
@@ -178,9 +178,9 @@
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: stable-2.12
-      - # Choose parent devstack job from master branch instead of non-existing stable/1.0.0 branch
+      - # Choose parent devstack job from stable/yoga branch instead of non-existing stable/1.0.0 branch
         name: openstack/devstack
-        override-checkout: master
+        override-checkout: stable/yoga
       - name: openstack/openstacksdk
         # Yoga has the latest SDK release of the 0.*.* series atm
         override-checkout: stable/yoga
@@ -214,6 +214,8 @@
       - # Choose parent devstack job from stable/xena branch
         name: openstack/devstack
         override-checkout: stable/xena
+      - name: openstack/designate
+        override-checkout: stable/xena
       - name: openstack/openstacksdk
         override-checkout: stable/xena
     vars:
@@ -244,6 +246,8 @@
       - # Choose parent devstack job from stable/wallaby branch
         name: openstack/devstack
         override-checkout: stable/wallaby
+      - name: openstack/designate
+        override-checkout: stable/wallaby
       - name: openstack/openstacksdk
         override-checkout: stable/wallaby
     vars:
@@ -274,6 +278,8 @@
       - # Choose parent devstack job from stable/victoria branch
         name: openstack/devstack
         override-checkout: stable/victoria
+      - name: openstack/designate
+        override-checkout: stable/victoria
       - name: openstack/openstacksdk
         override-checkout: stable/victoria
     vars:
@@ -304,6 +310,8 @@
       - # Choose parent devstack job from stable/ussuri branch
         name: openstack/devstack
         override-checkout: stable/ussuri
+      - name: openstack/designate
+        override-checkout: stable/ussuri
       - name: openstack/openstacksdk
         override-checkout: stable/ussuri
     vars:
@@ -334,6 +342,8 @@
       - # Choose parent devstack job from stable/train branch
         name: openstack/devstack
         override-checkout: stable/train
+      - name: openstack/designate
+        override-checkout: train-eol
       - name: openstack/openstacksdk
         override-checkout: stable/train
     vars:
diff --git a/ci/run-ansible-tests-collection.sh b/ci/run-ansible-tests-collection.sh
old mode 100644
new mode 100755
diff --git a/tools/run-ansible-sanity.sh b/tools/run-ansible-sanity.sh
old mode 100644
new mode 100755
diff --git a/tox.ini b/tox.ini
index 371aed54..b658fe86 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,6 @@ deps =
     -c{env:TOX_CONSTRAINTS_FILE:{toxinidir}/tests/constraints-none.txt}
     -r{toxinidir}/tests/requirements.txt
     pip: {toxinidir}
-
 commands = stestr run {posargs}
            stestr slowest
 
@@ -33,19 +32,20 @@ commands =
     flake8
 
 [testenv:build]
+allowlist_externals = bash
 deps =
     ansible-core
     galaxy-importer
     pbr
     ruamel.yaml
-
 commands =
     python {toxinidir}/tools/build.py
     ansible --version
     ansible-galaxy collection build --force {toxinidir} --output-path {toxinidir}/build_artifact
-    /bin/bash {toxinidir}/tools/check-import.sh {toxinidir}
+    bash {toxinidir}/tools/check-import.sh {toxinidir}
 
 [testenv:linters]
+allowlist_externals = bash
 passenv = *
 deps =
     {[testenv]deps}
@@ -53,7 +53,7 @@ commands =
     {[testenv:build]commands}
     {[testenv:pep8]commands}
     ansible --version
-    /bin/bash {toxinidir}/tools/run-ansible-sanity.sh {toxinidir}
+    bash {toxinidir}/tools/run-ansible-sanity.sh {toxinidir}
 
 [testenv:linters-2.9]
 passenv = {[testenv:linters]passenv}
@@ -88,6 +88,7 @@ show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_collections
 
 [testenv:ansible]
+allowlist_externals = bash
 # Need to pass some env vars for the Ansible playbooks
 passenv =
     HOME
@@ -96,7 +97,7 @@ passenv =
 deps =
     {[testenv]deps}
 commands =
-    /bin/bash {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs}
+    bash {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs}
 
 [testenv:ansible-2.9]
 deps =
@@ -120,11 +121,12 @@ passenv = {[testenv:ansible]passenv}
 commands = {[testenv:ansible]commands}
 
 [testenv:galaxy-release]
+allowlist_externals = mkdir rm sed
 deps =
     ansible-core
 commands =
-    /usr/bin/mkdir -p /tmp/collection_built
-    /usr/bin/bash -ec 'rm -rf /tmp/collection_built/*'
-    /usr/bin/sed -i "s/version:.*/version: {env:VERSION_TAG}/" {toxinidir}/galaxy.yml
+    rm -rf /tmp/collection_built/
+    mkdir -p /tmp/collection_built/
+    sed -i "s/version:.*/version: {env:VERSION_TAG}/" {toxinidir}/galaxy.yml
     ansible-galaxy collection build {toxinidir} --output-path /tmp/collection_built/ --force
     ansible-galaxy collection publish /tmp/collection_built/openstack-cloud-{env:VERSION_TAG}.tar.gz --token {env:API_GALAXY_TOKEN}