diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2cb080114caf0c74affd134d115d17b7f264c571..147eb7c00faf051ae25eea5d43422e2ee947d5bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -383,14 +383,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
@@ -740,7 +740,7 @@ uninterruptible:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: always
   tags:
-    - ivas-basop-linux
+    - ivas-linux
 
 # ---------------------------------------------------------------
 # Validation jobs