diff --git a/external/build_image.sh b/external/build_image.sh
index 671a0241d9..a08e7f2b11 100755
--- a/external/build_image.sh
+++ b/external/build_image.sh
@@ -67,7 +67,7 @@ function build_image() {
 	echo "The test in the build_image() function is ${test}"
     # Used for tagging the image
     tags="adoptopenjdk-${test}-test:${version}-${package}-${os}-${vm}-${build}"
-	if [[ "$test" == *"criu"* || "$test" == *"tck"* ]]; then
+	if [[ "$test" == *"criu"* || "$test" == tck-* ]]; then
 		container_build="sudo podman build"
 	fi
 
diff --git a/external/external.sh b/external/external.sh
index 584f66bf87..925e0f94fd 100755
--- a/external/external.sh
+++ b/external/external.sh
@@ -128,7 +128,7 @@ parseCommandLineArgs() {
 					docker_os=ubi
 				fi
 
-				if [[ "${test}" == *"criu"* || "${test}" == *"tck"* ]]; then
+				if [[ "${test}" == *"criu"* || "${test}" == tck-* ]]; then
 					container_run="sudo podman run"
 					container_login="sudo podman login"
 					container_inspect="sudo podman inspect"