diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f48458c787062104bab6dd73e9d55eac3210397f..c16992fdc5497f58f488319914d755924b7a2309 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1047,7 +1047,7 @@ uninterruptible:
 
 branch-is-up-to-date-with-target-pre:
   extends:
-    - .rules-merge-request
+    - .rules-merge-request-to-main-pc
   stage: prevalidate
   needs: []
   tags:
@@ -1063,7 +1063,7 @@ branch-is-up-to-date-with-target-pre:
 
 branch-is-up-to-date-with-target-post:
   extends:
-    - .rules-merge-request
+    - .rules-merge-request-to-main-pc
   stage: postvalidate
   tags:
     - ivas-basop-linux
@@ -1251,6 +1251,7 @@ build-codec-linux-cmake:
     - .build-job-linux
   tags:
     - ivas-basop-linux
+  timeout: "10 minutes"
   script:
     - *print-common-info
     - *update-scripts-repo
@@ -1322,7 +1323,7 @@ build-codec-linux-debugging-make:
       when: never
   extends:
     - .build-job-linux
-  timeout: "7 minutes"
+  timeout: "10 minutes"
   variables:
     BUILD_WITH_DEBUG_MODE_INFO: "true"
   script:
@@ -1337,7 +1338,7 @@ build-codec-linux-debugging-make:
 split-rendering-smoke-test:
   extends:
     - .test-job-linux
-    - .rules-merge-request
+    - .rules-merge-request-to-main-pc
   needs: ["build-codec-linux-make"]
   stage: test
   script:
@@ -1361,7 +1362,7 @@ split-rendering-smoke-test:
 lc3-wrapper-unit-test:
   extends:
     - .test-job-linux
-    - .rules-merge-request
+    - .rules-merge-request-to-main-pc
   needs: ["build-codec-linux-make"]
   stage: test
   script:
@@ -1376,7 +1377,7 @@ lc3-wrapper-unit-test:
 split-rendering-pytest-on-merge-request:
   extends:
     - .test-job-linux-needs-testv-dir
-    - .rules-merge-request
+    - .rules-merge-request-to-main-pc
   needs: ["build-codec-linux-make"]
   timeout: "45 minutes"
   stage: compare