diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bc5a6f072b0b84282eac06eedbe9c53e6b71871..6fe41be26523ebecad894bae173288a276f35567 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -286,14 +286,14 @@ stages:
 # templates to define stages and platforms
 .test-job-linux:
   tags:
-    - ivas-basop-linux
+    - ivas-linux
 
 .build-job-linux:
   stage: build
   timeout: "2 minutes"
   needs: []
   tags:
-    - ivas-basop-linux
+    - ivas-linux
 
 .build-job-windows:
   stage: build
@@ -653,7 +653,7 @@ uninterruptible:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: always
   tags:
-    - ivas-basop-linux
+    - ivas-linux
 
 # ---------------------------------------------------------------
 # verification jobs