diff --git a/roles/run-test/templates/toci_quickstart.sh.j2 b/roles/run-test/templates/toci_quickstart.sh.j2
index 3db0ab526..27ca4d207 100755
--- a/roles/run-test/templates/toci_quickstart.sh.j2
+++ b/roles/run-test/templates/toci_quickstart.sh.j2
@@ -102,10 +102,9 @@ if is_featureset mixed_os "{{ job_featureset_file }}"; then
     eight_release=$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-8/$QUICKSTART_RELEASE.yml
     RELEASE_ARGS=(
         ["multinode-overcloud-mixed-os-repos-compute.yml"]=" --extra-vars @$eight_release --extra-vars registry_distro=8 "
-        ["multinode-undercloud-mixed-os.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 "
+        ["multinode-undercloud-mixed-os.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 --extra-vars registry_distro_lower=8 "
         ["multinode-overcloud-prep.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 "
-        ["multinode-overcloud-mixed-os-deploy-control.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 "
-        ["multinode-overcloud-mixed-os-deploy-compute.yml"]=" --extra-vars @$eight_release --extra-vars registry_distro=8 "
+        ["multinode-overcloud-mixed-os-deploy-control.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 --extra-vars registry_distro_lower=8 "
     )
 fi
 
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 8883e0900..05742c3c8 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -152,7 +152,6 @@
         - multinode-undercloud-mixed-os.yml
         - multinode-overcloud-prep.yml
         - multinode-overcloud-mixed-os-deploy-control.yml
-        - multinode-overcloud-mixed-os-deploy-compute.yml
         - multinode-validate.yml
       tags: *multinode_tags