diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2cb41925e4c48f41b834b357e00802e434ae628..27f9631132991929eef75f8d732bc077c4925f06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,14 +223,14 @@ stages:
 # templates to define stages and platforms
 .test-job-linux:
   tags:
-    - ivas-linux
+    - test-fhg-linux-runner2
 
 .build-job-linux:
   stage: build
   timeout: "4 minutes"
   needs: []
   tags:
-    - ivas-linux
+    - test-fhg-linux-runner2
 
 .build-job-windows:
   stage: build
@@ -266,30 +266,30 @@ uninterruptible:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: always
   tags:
-    - ivas-linux
+    - test-fhg-linux-runner1
 
 # ---------------------------------------------------------------
 # Validation jobs
 # ---------------------------------------------------------------
 
-branch-is-up-to-date-with-main-pre:
+.branch-is-up-to-date-with-main-pre:
   extends:
     - .rules-merge-request
   stage: prevalidate
   needs: []
   tags:
-    - ivas-linux
+    - test-fhg-linux-runner1
   script:
     - *get-commits-behind-count
     - echo $commits_behind_count
     - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, run 'git merge origin/main' to update."; exit 1; fi;
 
-branch-is-up-to-date-with-main-post:
+.branch-is-up-to-date-with-main-post:
   extends:
     - .rules-merge-request
   stage: postvalidate
   tags:
-    - ivas-linux
+    - test-fhg-linux-runner1
   script:
     - *get-commits-behind-count
     - echo $commits_behind_count
@@ -299,7 +299,7 @@ branch-is-up-to-date-with-main-post:
 # Build jobs
 # ---------------------------------------------------------------
 
-build-codec-linux-make:
+.build-codec-linux-make:
   extends:
     - .build-job-linux
     - .rules-basis
@@ -308,7 +308,7 @@ build-codec-linux-make:
     - *activate-Werror-linux
     - make -j
 
-build-codec-linux-cmake:
+.build-codec-linux-cmake:
   extends:
     - .build-job-linux
     - .rules-basis
@@ -325,14 +325,16 @@ build-codec-instrumented-linux:
   extends:
     - .build-job-linux
     - .rules-basis
-  timeout: "6 minutes"
+  timeout: "7 minutes"
   script:
     - *print-common-info
     - *activate-Werror-linux
-    - bash ci/build_codec_instrumented_linux.sh
+    - ./scripts/prepare_instrumentation.sh
+    - make -j -C scripts/c-code_instrument
+    # - bash ci/build_codec_instrumented_linux.sh
 
 # make sure that the codec builds with msan, asan and usan
-build-codec-sanitizers-linux:
+.build-codec-sanitizers-linux:
   extends:
     - .build-job-linux
     - .rules-basis
@@ -341,7 +343,7 @@ build-codec-sanitizers-linux:
     - *activate-Werror-linux
     - bash ci/build_codec_sanitizers_linux.sh
 
-build-codec-include-split-linux-make:
+.build-codec-include-split-linux-make:
   extends:
     - .build-job-linux
     - .rules-basis
@@ -351,7 +353,7 @@ build-codec-include-split-linux-make:
     - *activate-Werror-linux
     - make -j INCLUDE_SPLIT=1
 
-build-codec-include-split-linux-cmake:
+.build-codec-include-split-linux-cmake:
   extends:
     - .build-job-linux
     - .rules-basis
@@ -365,7 +367,7 @@ build-codec-include-split-linux-cmake:
     - cd ..
     - make -C build -j
 
-build-codec-windows-cmake:
+.build-codec-windows-cmake:
   extends:
     - .build-job-windows
     - .rules-basis
@@ -375,7 +377,7 @@ build-codec-windows-cmake:
     - cmake -G "Visual Studio 15 2017" . -Bbuild
     - cmake --build build -j
 
-build-codec-windows-include-split-cmake:
+.build-codec-windows-include-split-cmake:
   extends:
     - .build-job-windows
     - .rules-basis
@@ -388,7 +390,7 @@ build-codec-windows-include-split-cmake:
     - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild
     - cmake --build build -j
 
-build-codec-windows-msbuild:
+.build-codec-windows-msbuild:
   extends:
     - .build-job-windows
     - .rules-basis
@@ -403,13 +405,13 @@ build-codec-windows-msbuild:
 # ---------------------------------------------------------------
 
 # test that runs all modes with 1s input signals
-codec-smoke-test:
+  .codec-smoke-test:
   extends:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
   timeout: "17 minutes"
   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:
@@ -437,7 +439,7 @@ codec-smoke-test:
     expose_as: "Smoke test results"
 
 # code selftest testvectors with memory-sanitizer binaries
-codec-msan:
+.codec-msan:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -460,7 +462,7 @@ codec-msan:
     expose_as: "msan selftest results"
 
 # code selftest testvectors with address-sanitizer binaries
-codec-asan:
+.codec-asan:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -483,7 +485,7 @@ codec-asan:
     expose_as: "asan selftest results"
 
 # code selftest testvectors with address-sanitizer binaries
-codec-usan:
+.codec-usan:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -506,7 +508,7 @@ codec-usan:
     expose_as: "usan selftest results"
 
 # test renderer executable
-renderer-smoke-test:
+.renderer-smoke-test:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -527,7 +529,7 @@ renderer-smoke-test:
         - report-junit.xml
 
 # test renderer executable with cmake + asan
-renderer-asan:
+.renderer-asan:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -550,7 +552,7 @@ renderer-asan:
         - report-junit.xml
 
 # test renderer executable with cmake + msan
-renderer-msan:
+.renderer-msan:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -573,7 +575,7 @@ renderer-msan:
         - report-junit.xml
 
 # test renderer executable with cmake + usan
-renderer-usan:
+.renderer-usan:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -600,7 +602,7 @@ renderer-usan:
         - report-junit.xml
 
 # compare renderer bitexactness between target and source branch
-renderer-pytest-on-merge-request:
+.renderer-pytest-on-merge-request:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -651,7 +653,7 @@ renderer-pytest-on-merge-request:
         - report-junit.xml
 
 # test split rendering
-split-rendering-smoke-test:
+.split-rendering-smoke-test:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -673,7 +675,7 @@ split-rendering-smoke-test:
         - report-junit.xml
 
 # compare split-rendering bitexactness between target and source branch
-split-rendering-pytest-on-merge-request:
+.split-rendering-pytest-on-merge-request:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -745,7 +747,7 @@ split-rendering-pytest-on-merge-request:
         - report-junit.xml
 
 # compare bit exactness between target and source branch
-ivas-pytest-on-merge-request:
+.ivas-pytest-on-merge-request:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -801,7 +803,7 @@ ivas-pytest-on-merge-request:
 
 
 # Check interop IVAS_cod_test -> IVAS_dec_ref
-ivas-interop-on-merge-request:
+.ivas-interop-on-merge-request:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -855,7 +857,7 @@ ivas-interop-on-merge-request:
       junit:
         - report*-junit.xml
 
-evs-pytest-on-merge-request:
+.evs-pytest-on-merge-request:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -906,7 +908,7 @@ evs-pytest-on-merge-request:
       junit:
         - report-junit-evs.xml
 
-voip-be-on-merge-request:
+.voip-be-on-merge-request:
   extends:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
@@ -917,7 +919,7 @@ voip-be-on-merge-request:
     - *print-common-info
     - bash ci/ivas_voip_be_test.sh
 
-clang-format-check:
+.clang-format-check:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -964,12 +966,12 @@ clang-format-check:
     expose_as: "formatting patch"
 
 # check for crashes if first received frame on decoder side is an SID
-check-first-frame-is-sid:
+.check-first-frame-is-sid:
   extends:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
   tags:
-    - ivas-linux
+    - test-fhg-linux-runner1
   stage: test
   needs: ["build-codec-linux-cmake"]
   script:
@@ -1003,7 +1005,7 @@ check-first-frame-is-sid:
     expose_as: "logs-sidstart"
     expire_in: "5 days"
 
-lc3plus-ensure-no-code-changes:
+.lc3plus-ensure-no-code-changes:
   extends:
     - .test-job-linux
     - .rules-merge-request
@@ -1023,7 +1025,7 @@ lc3plus-ensure-no-code-changes:
 # ---------------------------------------------------------------
 
 # check bitexactness to EVS windows binaries
-be-2-evs-windows:
+.be-2-evs-windows:
   extends:
     - .rules-main-push
   tags:
@@ -1047,7 +1049,7 @@ be-2-evs-windows:
     - python ../ci/run_evs_be_win_test.py
 
 # check bitexactness to EVS
-be-2-evs-linux:
+.be-2-evs-linux:
   extends:
     - .test-job-linux
     - .rules-main-push
@@ -1073,7 +1075,7 @@ be-2-evs-linux:
     - cd evs_be_test
     - python3 ../ci/run_evs_be_test.py
 
-codec-comparison-on-main-push:
+.codec-comparison-on-main-push:
   extends:
     - .test-job-linux
     - .rules-main-push
@@ -1160,7 +1162,7 @@ codec-comparison-on-main-push:
 # Manual jobs
 # ---------------------------------------------------------------
 
-test-be-to-release:
+.test-be-to-release:
   stage: test
   tags:
     - ivas-windows
@@ -1187,7 +1189,7 @@ test-be-to-release:
     expose_as: "test-be-to-release results"
 
 
-test-long-self-test:
+.test-long-self-test:
   tags:
     - ivas-linux-fast
   stage: compare