diff --git a/.cirrus.yml b/.cirrus.yml
index eb2414dc0a0..6628d0bbbbb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -132,13 +132,13 @@ task:
     FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
 
 task:
-  name: 'previous releases, qt5 dev package and depends packages, DEBUG'
+  name: 'previous releases, depends DEBUG'
   << : *GLOBAL_TASK_TEMPLATE
   persistent_worker:
     labels:
       type: small
   env:
-    FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
+    FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh"
 
 task:
   name: 'TSan, depends, gui'
@@ -200,10 +200,10 @@ task:
     FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
 
 task:
-  name: 'macOS-cross 11.0, gui, no tests'
+  name: 'macOS-cross, gui, no tests'
   << : *GLOBAL_TASK_TEMPLATE
   persistent_worker:
     labels:
       type: small
   env:
-    FILE_ENV: "./ci/test/00_setup_env_mac.sh"
+    FILE_ENV: "./ci/test/00_setup_env_mac_cross.sh"
diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac_cross.sh
similarity index 100%
rename from ci/test/00_setup_env_mac.sh
rename to ci/test/00_setup_env_mac_cross.sh
diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_previous_releases.sh
similarity index 95%
rename from ci/test/00_setup_env_native_qt5.sh
rename to ci/test/00_setup_env_native_previous_releases.sh
index 2492cfb58c9..94e88f872f5 100755
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/ci/test/00_setup_env_native_previous_releases.sh
@@ -6,7 +6,7 @@
 
 export LC_ALL=C.UTF-8
 
-export CONTAINER_NAME=ci_native_qt5
+export CONTAINER_NAME=ci_native_previous_releases
 export CI_IMAGE_NAME_TAG="docker.io/debian:bullseye"
 # Use minimum supported python3.9 and gcc-10, see doc/dependencies.md
 export PACKAGES="gcc-10 g++-10 python3-zmq"