diff --git a/.gitlab-ci/kubevirt.yml b/.gitlab-ci/kubevirt.yml
index ce580fe07..dd3e3dec7 100644
--- a/.gitlab-ci/kubevirt.yml
+++ b/.gitlab-ci/kubevirt.yml
@@ -43,7 +43,6 @@ pr:
           - fedora39-kube-router
           - fedora41-kube-router
           - fedora42-calico
-          - openeuler24-calico
           - rockylinux9-cilium
           - rockylinux10-cilium
           - ubuntu22-calico-all-in-one
@@ -57,9 +56,19 @@ pr:
           - ubuntu24-kube-router-sep
           - ubuntu24-kube-router-svc-proxy
           - ubuntu24-ha-separate-etcd
-          - flatcar4081-calico
           - fedora40-flannel-crio-collection-scale
 
+# This is for flakey test so they don't disrupt the PR worklflow too much.
+# Jobs here MUST have a open issue so we don't lose sight of them
+pr-flakey:
+  extends: pr
+  retry: 1
+  parallel:
+    matrix:
+      - TESTCASE:
+          - flatcar4081-calico # https://github.com/kubernetes-sigs/kubespray/issues/12309
+          - openeuler24-calico # https://github.com/kubernetes-sigs/kubespray/issues/12877
+
 # The ubuntu24-calico-all-in-one jobs are meant as early stages to prevent running the full CI if something is horribly broken
 ubuntu24-calico-all-in-one:
   stage: deploy-part1
diff --git a/roles/system_packages/defaults/main.yml b/roles/system_packages/defaults/main.yml
index 62704067a..79c9836a4 100644
--- a/roles/system_packages/defaults/main.yml
+++ b/roles/system_packages/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
 # number of times package install task should be retried
 pkg_install_retries: 4
+pkg_install_timeout: "{{ 5 * 60 }}"
 yum_repo_dir: /etc/yum.repos.d
diff --git a/roles/system_packages/tasks/main.yml b/roles/system_packages/tasks/main.yml
index f0bc875df..ebb98147a 100644
--- a/roles/system_packages/tasks/main.yml
+++ b/roles/system_packages/tasks/main.yml
@@ -63,3 +63,4 @@
     label: "{{ item.action_label }}"
   tags:
     - bootstrap_os
+  timeout: "{{ pkg_install_timeout }}"