diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1214011df7dee10d849db1aefbbf9e0d97f67147..8ef015c266ff98bb03076fcde6432fd6942bbbf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ after_script:
 do-build:
   stage: build
   tags:
-    - psz
+    - ubuntu18
   script:
     - "# update submodules" 
     - "git submodule sync --recursive"
@@ -28,8 +28,7 @@ do-build:
 xform-ls:
   stage: test
   tags:
-    - psz
-    - integration
+    - ubuntu18
   script:
     - "cd /tmp/peasoup_test"
     - "source set_env_vars"
@@ -43,8 +42,7 @@ xform-ls:
 basic-pgms-rida:
   stage: test
   tags:
-    - psz
-    - integration
+    - ubuntu18
   script:
     - "cd /tmp/peasoup_test"
     - "source set_env_vars"
@@ -54,8 +52,7 @@ basic-pgms-rida:
 basic-pgms-rida-p1:
   stage: test
   tags:
-    - psz
-    - integration
+    - ubuntu18
   script:
     - "cd /tmp/peasoup_test"
     - "source set_env_vars"