diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17feb07fb..1a9f7fb4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -238,7 +238,7 @@ test_nvs_on_host:
   stage: test
   image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
   tags:
-    - nvs_host_test
+    - host_test
   dependencies: []
   script:
     - cd components/nvs_flash/test_nvs_host
@@ -248,7 +248,7 @@ test_nvs_coverage:
   stage: test
   image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
   tags:
-    - nvs_host_test
+    - host_test
   dependencies: []
   artifacts:
     paths:
@@ -276,7 +276,7 @@ test_wl_on_host:
   stage: test
   image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
   tags:
-    - wl_host_test
+    - host_test
   artifacts:
     paths:
       - components/wear_levelling/test_wl_host/coverage_report.zip
@@ -289,7 +289,7 @@ test_multi_heap_on_host:
   stage: test
   image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
   tags:
-    - wl_host_test
+    - host_test
   script:
     - cd components/heap/test_multi_heap_host
     - ./test_all_configs.sh
@@ -298,7 +298,7 @@ test_build_system:
   stage: test
   image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
   tags:
-    - build_test
+    - host_test
   dependencies: []
   script:
     - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
@@ -366,7 +366,7 @@ test_esp_err_to_name_on_host:
   stage: test
   image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
   tags:
-    - build
+    - host_test
   dependencies: []
   script:
     - cd tools/