diff --git a/.zuul.yaml b/.zuul.yaml
index 68187ab086..808f0a09b3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -80,6 +80,7 @@
 - job:
     name: manila-tempest-base
     parent: legacy-dsvm-base
+    nodeset: openstack-single-node-bionic
     irrelevant-files:
       - ^(test-|)requirements.txt$
       - ^.*\.rst$
@@ -378,6 +379,7 @@
 - job:
     name: manila-rally-multibackend
     parent: legacy-dsvm-base
+    nodeset: openstack-single-node-bionic
     run: playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml
     post-run: playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
     timeout: 4200
@@ -400,6 +402,7 @@
 - job:
     name: manila-rally-multibackend-no-ss
     parent: legacy-dsvm-base
+    nodeset: openstack-single-node-bionic
     run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml
     post-run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
     timeout: 4200
diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh
index 6cd77538d5..1ae53e1e4e 100755
--- a/contrib/ci/pre_test_hook.sh
+++ b/contrib/ci/pre_test_hook.sh
@@ -28,6 +28,11 @@ echo "API_RATE_LIMIT=False" >> $localconf
 echo "VOLUME_BACKING_FILE_SIZE=22G" >> $localconf
 echo "CINDER_LVM_TYPE=thin" >> $localconf
 
+# Set DevStack's PYTHON3_VERSION variable if CI scripts specify it
+if ! [[ -z "PYTHON3_VERSION" ]]; then
+echo "PYTHON3_VERSION=$PYTHON3_VERSION" >> $localconf
+fi
+
 # NOTE(mkoderer): switch to keystone v3 by default
 echo "IDENTITY_API_VERSION=3" >> $localconf
 
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 5c8d0c807a..53a940ba71 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -6,6 +6,8 @@ register_db_to_save manila
 export BASE_RUN_SMOKE=False
 export TARGET_RUN_SMOKE=False
 export ENABLE_TEMPEST=False
+export PYTHON3_VERSION=${PYTHON3_VERSION}
+
 
 devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
 devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/rocky
diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
index 4c699fc12a..2c186e1afc 100644
--- a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
+++ b/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
index 4c699fc12a..2c186e1afc 100644
--- a/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
+++ b/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node