diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
index a67ff56f0e31c319f677e016b43bb71ac8b3088a..7c4fadbdb5946374fb70a1954d5aed0e38a6bd64 100644
--- a/.gitlab-ci.yaml
+++ b/.gitlab-ci.yaml
@@ -43,8 +43,7 @@ prepare_hived_image:
     HIVE_NETWORK_TYPE: mainnet
   tags:
     - public-runner-docker
-    - hived-for-tests
-    - haf-build-mainnet
+    - build-mainnet
 
 prepare_hived_data:
   extends: .prepare_hived_data_5m
@@ -74,7 +73,6 @@ cleanup_cache_on_hived_builders:
     CLEANUP_PATH_PATTERN: "/nfs/ci-cache/hive/replay_data_hive_*"
   tags:
     - public-runner-docker
-    - hived-for-tests
 
 cleanup_old_hived_cache:
   extends: .cleanup_old_cache_template
@@ -99,8 +97,7 @@ testnet_node_build:
       - "$BINARY_CACHE_PATH"
   tags:
     - public-runner-docker
-    - hived-for-tests
-    - haf-build-testnet
+    - build-testnet
 
 beekeeper_tsc_build:
   extends: .npm_build_template
@@ -225,8 +222,7 @@ mirrornet_node_build:
 
   tags:
     - public-runner-docker
-    - hived-for-tests
-    - haf-build-mirrornet
+    - build-mirrornet
 
 extended_block_log_creation:
   extends: .extended_block_log_creation
@@ -893,7 +889,6 @@ python_pattern_testnet_tests:
                wallet_bridge_api_tests ]
   tags:
     - public-runner-docker
-    - hived-for-tests
 
 message_format_mainnet_5m_tests:
   extends: .message_format_tests
@@ -1018,7 +1013,6 @@ publish_docker_image:
     - scripts/ci-helpers/build_and_publish_instance.sh
   tags:
     - public-runner-docker
-    - hived-for-tests
 
 hardfork_schedule_tests:
   stage: test
@@ -1837,7 +1831,7 @@ generate_testing_block_logs:
     paths:
       - $TESTING_BLOCK_LOGS_DIR/checksums/
   tags:
-    - hived-for-tests
+    - public-runner-docker
 
 build_combined_testing_block_logs_image:
   stage: build