diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0593f0c8b483b48c908cc74baaa177706d668bc..29acd4b0d0ca933511b1977c1ddc4c8cfef82585 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -337,6 +337,8 @@ FileLicenceCheck:
   stage: build
   tags:
     - CbmRoot
+  # Possible since Gitlab 15.7, job-level timeout can exceed project timeout but not Runner timeout
+  timeout: 1h 30m # Continuous tests after merge need more time than the pre-merge CI
 
 .linux_variables: &linux_variables
     OS: "Debian12"
@@ -347,6 +349,7 @@ FileLicenceCheck:
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
     EXTRA_PATH: "${SIMPATH}/bin"
+    CI_TEST_STAGE_TOTAL_TIME_LIMIT: 1800 # in seconds = 30 m, Continuous tests after merge need longer than pre-merge CI
 
 .macosx_tag: &macosx_tag
   stage: build