diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3161135bdbc812bac031d07ffcf90e95eee5f14c..a0593f0c8b483b48c908cc74baaa177706d668bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -206,7 +206,7 @@ FileLicenceCheck:
 # job template
 #
 .build_and_test: &build_and_test
-  timeout: 1h 30m # Possible since Gitlab 15.7, job-level timeout can exceed project timeout but not Runner timeout
+  timeout: 1h # Possible since Gitlab 15.7, job-level timeout can exceed project timeout but not Runner timeout
   before_script:
     - if [ "$CI_MERGE_REQUEST_PROJECT_PATH" != "computing/cbmroot" ]; then
     -   if [ "$CI_PROJECT_PATH" != "computing/cbmroot" ]; then
@@ -262,7 +262,7 @@ FileLicenceCheck:
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
     CHECK_GEO_HASH_CHANGE: "1"
-    CI_TEST_STAGE_TOTAL_TIME_LIMIT: 2100 # 35 minutes until MR 1952 is merged
+    CI_TEST_STAGE_TOTAL_TIME_LIMIT: 1500 # in seconds = 25 minutes
 
 .apptainer_tag: &apptainer_tag
   stage: build