diff --git a/.ci/run.sh b/.ci/run.sh
index 32d8217..caf00a7 100755
--- a/.ci/run.sh
+++ b/.ci/run.sh
@@ -69,12 +69,6 @@ case "${CI_JOB}" in
                sudo -E PATH="$PATH" bash -c "make crio"
                ;;
        "CLOUD-HYPERVISOR")
-               echo "INFO: Containerd checks"
-               sudo -E PATH="$PATH" bash -c "make cri-containerd"
-
-               echo "INFO: Running kubernetes tests"
-               sudo -E PATH="$PATH" bash -c "make kubernetes"
-
                echo "INFO: Running soak test"
                sudo -E PATH="$PATH" bash -c "make docker-stability"
 
@@ -84,14 +78,28 @@ case "${CI_JOB}" in
                echo "INFO: Running networking tests"
                sudo -E PATH="$PATH" bash -c "make network"
                ;;
+       "CLOUD-HYPERVISOR-K8S-CONTAINERD")
+               echo "INFO: Containerd checks"
+               sudo -E PATH="$PATH" bash -c "make cri-containerd"
+
+               echo "INFO: Running kubernetes tests"
+               sudo -E PATH="$PATH" bash -c "make kubernetes"
+               ;;
+       "CLOUD-HYPERVISOR-K8S-CRIO")
+               echo "INFO: Containerd checks"
+               sudo -E PATH="$PATH" bash -c "make cri-"
+
+               echo "INFO: Running kubernetes tests"
+               sudo -E PATH="$PATH" bash -c "make kubernetes"
+               ;;
        "CLOUD-HYPERVISOR-DOCKER")
                echo "INFO: Running docker integration tests"
                sudo -E PATH="$PATH" bash -c "make docker"
                ;;
-       "CLOUD-HYPERVISOR-K8S-CRIO")
+       "CLOUD-HYPERVISOR-K8S-E2E-CRIO")
                k8s_e2e
                ;;
-       "CLOUD-HYPERVISOR-K8S-CONTAINERD")
+       "CLOUD-HYPERVISOR-K8S-E2E-CONTAINERD")
                k8s_e2e
                ;;
        "PODMAN")