diff --git a/main-basop.yml b/main-basop.yml
index 7ce1ffc628af09e3649b1220db31e2d0520e3887..b22af906c81fc0eebeb76704b281b24112c4b5d1 100644
--- a/main-basop.yml
+++ b/main-basop.yml
@@ -368,7 +368,7 @@ workflow:
   extends:
     - .check-be-job
   stage: check-be
-  timeout: "300 minutes"
+  timeout: "60 minutes"
   variables:
     XML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"
     HTML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.html"
@@ -922,7 +922,7 @@ build-codec-linux-make:
       when: never
   extends:
     - .build-job-linux
-  timeout: "100 minutes"
+  timeout: "10 minutes"
   script:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/activate-Werror-linux.sh
@@ -962,7 +962,7 @@ build-codec-linux-instrumented-make:
       when: never
   extends:
     - .build-job-linux
-  timeout: "100 minutes"
+  timeout: "12 minutes"
   script:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
@@ -983,7 +983,7 @@ build-codec-sanitizers-linux:
       when: never
   extends:
     - .build-job-linux
-  timeout: "100 minutes"
+  timeout: "10 minutes"
   script:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
@@ -1002,7 +1002,7 @@ build-codec-linux-debugging-make:
       when: never
   extends:
     - .build-job-linux
-  timeout: "100 minutes"
+  timeout: "10 minutes"
   variables:
     BUILD_WITH_DEBUG_MODE_INFO: "true"
   script:
@@ -1563,7 +1563,7 @@ lc3-wrapper-unit-test:
   extends:
     - .test-job-linux
     - .rules-merge-request-no-draft
-  needs: ["build-codec-linux-make"]
+  needs: ["build-codec-linux-cmake"]
   stage: test
   script:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
@@ -1611,7 +1611,7 @@ renderer-asan:
   extends:
     - .test-job-linux
     - .rules-merge-request-to-float-ref-no-draft
-  needs: ["build-codec-linux-make"]
+  needs: ["build-codec-linux-cmake"]
   stage: test
   script:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
@@ -1638,7 +1638,7 @@ renderer-msan:
   extends:
     - .test-job-linux
     - .rules-merge-request-to-float-ref-no-draft
-  needs: ["build-codec-linux-make"]
+  needs: ["build-codec-linux-cmake"]
   stage: test
   tags: 
     - ivas-basop-linux
@@ -1667,7 +1667,7 @@ renderer-usan:
   extends:
     - .test-job-linux
     - .rules-merge-request-to-float-ref-no-draft
-  needs: ["build-codec-linux-make"]
+  needs: ["build-codec-linux-cmake"]
   stage: test
   tags: 
     - ivas-basop-linux
@@ -1767,7 +1767,7 @@ renderer-usan:
   extends:
     - .sanitizer-selftest-on-mr
   tags:
-    - ivas-basop--linux
+    - ivas-basop-linux
   before_script:
     - CLANG_NUM=2
     - SELFTEST_SANITY_TIMEOUT=180
@@ -1780,7 +1780,7 @@ renderer-usan:
   extends:
     - .sanitizer-selftest-on-mr
   tags:
-    - ivas-basop--linux
+    - ivas-basop-linux
   before_script:
     - CLANG_NUM=3
     - SELFTEST_SANITY_TIMEOUT=180
@@ -2231,7 +2231,7 @@ be-2-evs-26444:
     - be-2-evs-basop
   stage: test
   needs: ["build-codec-linux-make"]
-  timeout: "120 minutes" # To be revisited
+  timeout: "30 minutes"
   script:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
diff --git a/main.yml b/main.yml
index 16d4c904023db6197cdcd6aebafda54d3c3482a6..81295f08271ae99e3d91ad70adc215dcf99dfd00 100644
--- a/main.yml
+++ b/main.yml
@@ -16,9 +16,9 @@ stages:
   - prevalidate
   - build
   # only in basop
+  - compare
+  # only in basop
   - check-be
   - test
-  # only in basop
-  - compare
   - postvalidate
   - deploy