diff --git a/.gitlab-ci/kubevirt.yml b/.gitlab-ci/kubevirt.yml
index 944a3e0fe..ce580fe07 100644
--- a/.gitlab-ci/kubevirt.yml
+++ b/.gitlab-ci/kubevirt.yml
@@ -51,6 +51,8 @@ pr:
           - ubuntu24-calico-etcd-datastore
           - ubuntu24-calico-all-in-one-hardening
           - ubuntu24-cilium-sep
+          - ubuntu24-crio-scale
+          - ubuntu24-crio-upgrade
           - ubuntu24-flannel-collection
           - ubuntu24-kube-router-sep
           - ubuntu24-kube-router-svc-proxy
diff --git a/docs/developers/ci.md b/docs/developers/ci.md
index f905f22ab..31eac6a56 100644
--- a/docs/developers/ci.md
+++ b/docs/developers/ci.md
@@ -40,7 +40,7 @@ openeuler24 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 rockylinux10 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 rockylinux9 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 ubuntu22 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
-ubuntu24 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+ubuntu24 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
 
 ## docker
 
diff --git a/tests/files/ubuntu24-crio-scale.yml b/tests/files/ubuntu24-crio-scale.yml
new file mode 100644
index 000000000..e9818aaa3
--- /dev/null
+++ b/tests/files/ubuntu24-crio-scale.yml
@@ -0,0 +1,8 @@
+---
+cloud_image: ubuntu-2404
+container_manager: crio
+
+cluster_layout:
+  - node_groups: ["kube_control_plane", "etcd"]
+  - node_groups: ["kube_node"]
+  - node_groups: ["kube_node", "for_scale"]
diff --git a/tests/files/ubuntu24-crio-upgrade b/tests/files/ubuntu24-crio-upgrade
new file mode 100644
index 000000000..77bf528c8
--- /dev/null
+++ b/tests/files/ubuntu24-crio-upgrade
@@ -0,0 +1 @@
+UPGRADE_TEST=graceful
diff --git a/tests/files/ubuntu24-crio-upgrade.yml b/tests/files/ubuntu24-crio-upgrade.yml
new file mode 100644
index 000000000..5157c72fe
--- /dev/null
+++ b/tests/files/ubuntu24-crio-upgrade.yml
@@ -0,0 +1,16 @@
+---
+# Instance settings
+cloud_image: ubuntu-2404
+mode: all-in-one
+vm_memory: 1800
+
+# Kubespray settings
+container_manager: crio
+auto_renew_certificates: true
+
+# Currently ipvs not available on KVM: https://packages.ubuntu.com/search?suite=noble&arch=amd64&mode=exactfilename&searchon=contents&keywords=ip_vs_sh.ko
+kube_proxy_mode: iptables
+enable_nodelocaldns: false
+
+# Single node don't need the DNS autoscaler
+enable_dns_autoscaler: false