diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35a5f4eaa6016d8461903894a3686f28bc8887c7..18b23a32e27ed8e6cdcc9ab878a6f6452376621d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ variables:
 build-base-image:
   stage: build-base-image
   tags:
-    - shell-yc
+    - picodata-shell
   rules:
     - <<: *if-build-base-changes-on-master-branch
       variables:
@@ -134,7 +134,7 @@ build-base-image:
 test-linux:
   extends: .test
   tags:
-    - docker-yc
+    - picodata-docker
   rules:
     - <<: *if-build-base-changes-on-master-branch
       variables: