diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e35d0e290e66869bc2ccf7666350cea5a72488fb..6efbc33bf419986836ba34ba684831a872dbd03a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1052,7 +1052,7 @@ branch-is-up-to-date-with-target-pre:
   stage: prevalidate
   needs: []
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   script:
     - *get-commits-behind-count
     - echo $commits_behind_count
@@ -1067,7 +1067,7 @@ branch-is-up-to-date-with-target-post:
     - .rules-merge-request-to-main-pc
   stage: postvalidate
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   script:
     - *get-commits-behind-count
     - echo $commits_behind_count
@@ -1097,7 +1097,7 @@ check-naming-of-branch-for-main-pc-merges:
     - .rules-merge-request-to-main-pc
   stage: prevalidate
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   script:
     - *update-scripts-repo
     - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then
@@ -1114,7 +1114,7 @@ branch-is-up-to-date-with-target-pre:
   stage: prevalidate
   needs: []
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   script:
     - *get-commits-behind-count
     - |
@@ -1128,7 +1128,7 @@ branch-is-up-to-date-with-target-post:
     - .rules-merge-request
   stage: postvalidate
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   script:
     - *get-commits-behind-count
     - |
@@ -1150,7 +1150,7 @@ clang-format-check:
     ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix"
   stage: prevalidate
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   needs: []
   timeout: "5 minutes"
   script:
@@ -1233,7 +1233,7 @@ build-codec-linux-make:
   extends:
     - .build-job-linux
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   timeout: "10 minutes"
   script:
     - *print-common-info
@@ -1251,7 +1251,7 @@ build-codec-linux-cmake:
   extends:
     - .build-job-linux
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   timeout: "10 minutes"
   script:
     - *print-common-info
@@ -1272,7 +1272,7 @@ build-codec-linux-instrumented-make:
     - .build-job-linux
   timeout: "10 minutes"
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   script:
     - *print-common-info
     - *update-scripts-repo
@@ -1286,7 +1286,7 @@ build-codec-sanitizers-linux:
     - .build-job-linux
     - .rules-basis
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   timeout: "10 minutes"
   script:
     - *update-scripts-repo
@@ -1703,7 +1703,7 @@ ivas-pytest-enc-msan:
   extends:
     - .test-job-linux
   tags:
-    - ivas-basop-linux-fast
+    - ivas-linux-fast
   before_script:
     - CLANG_NUM=1
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1714,7 +1714,7 @@ ivas-pytest-enc-asan:
   extends:
     - .test-job-linux
   tags:
-    - ivas-basop-linux-fast
+    - ivas-linux-fast
   before_script:
     - CLANG_NUM=2
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1725,7 +1725,7 @@ ivas-pytest-enc-usan:
   extends:
     - .test-job-linux
   tags:
-    - ivas-basop-linux-fast
+    - ivas-linux-fast
   before_script:
     - CLANG_NUM=3
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1793,7 +1793,7 @@ ivas-pytest-dec-msan:
   extends:
     - .test-job-linux
   tags:
-    - ivas-basop-linux-fast
+    - ivas-linux-fast
   before_script:
     - CLANG_NUM=1
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1804,7 +1804,7 @@ ivas-pytest-dec-asan:
   extends:
     - .test-job-linux
   tags:
-    - ivas-basop-linux-fast
+    - ivas-linux-fast
   before_script:
     - CLANG_NUM=2
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1815,7 +1815,7 @@ ivas-pytest-dec-usan:
   extends:
     - .test-job-linux
   tags:
-    - ivas-basop-linux-fast
+    - ivas-linux-fast
   before_script:
     - CLANG_NUM=3
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -2095,7 +2095,7 @@ voip-be-on-merge-request:
     - .rules-merge-request-no-draft
   timeout: "20 minutes"
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   stage: test
   needs: ["build-codec-linux-make"] #, "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]
   script:
@@ -2129,7 +2129,7 @@ renderer-pytest-on-merge-request:
   # TODO: set reasonable timeout, will most likely take less
   timeout: "20 minutes"
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   stage: compare
   script:
     - *print-common-info
@@ -2189,7 +2189,7 @@ ivas-pytest-on-merge-request:
   needs: ["build-codec-linux-make"] #, "codec-smoke-test"]
   timeout: "40 minutes"
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   script:
     - *print-common-info
     - *get-commits-behind-count
@@ -2682,7 +2682,7 @@ complexity-osba-in-binaural_room_ir-out:
 pages:
   stage: deploy
   tags:
-    - ivas-basop-linux
+    - ivas-linux
   rules:
     - if: $UPDATE_PAGES
   script: