diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8ebf8062a9559206890c8646b1d686e2132bb84..8a0d2a8eb3d207efdda40e57cdbb097c230ce92e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ variables:
       - 'test-branch-vs-input-passthrough'
 
   GIT_CLEAN_FLAGS: -ffdxq
-  TESTCASE_TIMEOUT_STV_SANITIZERS: 180
+  TESTCASE_TIMEOUT_STV_SANITIZERS: 1800
   TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400
   BASOP_REFERENCE_BRANCH: "ivas-float-update"
   SCALE_FACTOR: "3.162"
@@ -580,9 +580,9 @@ codec-smoke-test:
   extends:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
-  timeout: "20 minutes"
+  timeout: "2 hours"
   tags:
-    - ivas-linux-fast
+    - test-fhg-linux-runner1
   stage: test
   needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]
   script:
@@ -612,7 +612,7 @@ codec-msan:
   extends:
     - .sanitizer-selftest-on-mr
   tags:
-    - ivas-linux-fast
+    - test-fhg-linux-runner1
   before_script:
     - CLANG_NUM=1
     - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
@@ -624,6 +624,8 @@ codec-msan:
 codec-asan:
   extends:
     - .sanitizer-selftest-on-mr
+  tags:
+    - test-fhg-linux-runner1 
   before_script:
     - CLANG_NUM=2
     - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
@@ -636,7 +638,7 @@ codec-usan:
   extends:
     - .sanitizer-selftest-on-mr
   tags:
-    - ivas-linux-fast
+    - test-fhg-linux-runner1
   before_script:
     - CLANG_NUM=3
     - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS