diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 6e5e8b67c6a..fa5b6c39d4c 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -316,6 +316,7 @@ fedora/x86_64_build:
 
 
 .kernel+rootfs:
+  timeout: 2h  # 24.0-only change
   extends:
     - .container+build-rules
     - .debian-container