diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13df7886bcdd1678d0be052d206f90b1832ce253..55d06b2c7a1da577c255ab8d8d7bdfb0decaf033 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -279,14 +279,14 @@ stages:
 # templates to define stages and platforms
 .test-job-linux:
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
 
 .build-job-linux:
   stage: build
   timeout: "4 minutes"
   needs: []
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
 
 .build-job-windows:
   stage: build
@@ -368,7 +368,7 @@ uninterruptible:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: always
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
 
 # ---------------------------------------------------------------
 # Validation jobs
@@ -380,7 +380,7 @@ branch-is-up-to-date-with-main-pre:
   stage: prevalidate
   needs: []
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
   script:
     - *get-commits-behind-count
     - echo $commits_behind_count
@@ -392,7 +392,7 @@ check-self-test-names-pre:
   stage: prevalidate
   needs: []
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
   script:
     - python3 ci/check_self_test_names.py scripts/config/self_test.prm 135
 
@@ -402,7 +402,7 @@ branch-is-up-to-date-with-main-post:
     - .rules-merge-request
   stage: postvalidate
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
   script:
     - *get-commits-behind-count
     - echo $commits_behind_count
@@ -1070,7 +1070,7 @@ check-first-frame-is-sid:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
   stage: test
   needs: ["build-codec-linux-cmake"]
   script:
@@ -1417,7 +1417,7 @@ ivas-conformance:
 
 ivas-conformance-linux:
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
   stage: test
   timeout: "90 minutes"
   rules:
@@ -2179,7 +2179,7 @@ coverage-test-on-main-scheduled:
     - .test-job-linux-needs-testv-dir
     - .rules-main-scheduled
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
   stage: test
   rules:
     # only run in scheduled pipeline that passes this env vars
@@ -2392,7 +2392,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
 pages:
   stage: deploy
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner-7
   rules:
     - if: $UPDATE_PAGES
   script: