diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index c450b3ca9f..7526c02a06 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -3,6 +3,8 @@
   image: $ESP_ENV_IMAGE
   tags:
     - build
+    # build only on shiny servers since shiny storage server is at the same location
+    - shiny
   variables:
     # Enable ccache for all build jobs. See configure_ci_environment.sh for more ccache related settings.
     IDF_CCACHE_ENABLE: "1"
@@ -19,10 +21,6 @@
   needs:
     - job: fast_template_app
       artifacts: false
-  tags:
-    - build
-    # build only on shiny servers since shiny storage server is at the same location
-    - shiny
   artifacts:
     paths:
       - "**/build*/size.json"
diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml
index c84f7fd653..40b1ac0064 100644
--- a/.gitlab/ci/host-test.yml
+++ b/.gitlab/ci/host-test.yml
@@ -36,8 +36,6 @@ test_nvs_coverage:
 
 test_partition_table_on_host:
   extends: .host_test_template
-  tags:
-    - build
   script:
     - cd components/partition_table/test_gen_esp32part_host
     - ./gen_esp32part_tests.py
@@ -144,8 +142,6 @@ test_multi_heap_on_host:
 
 test_certificate_bundle_on_host:
   extends: .host_test_template
-  tags:
-    - build
   script:
     - cd components/mbedtls/esp_crt_bundle/test_gen_crt_bundle/
     - ./test_gen_crt_bundle.py
diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 1d12dc05af..1ba4e0f3c9 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -58,8 +58,6 @@ test_check_kconfigs:
 
 check_blobs:
   extends: .pre_check_template
-  tags:
-    - build
   variables:
     SUBMODULES_TO_FETCH: "components/esp_wifi/lib;components/esp_phy/lib"
   script:
@@ -84,8 +82,6 @@ check_public_headers:
   extends:
     - .pre_check_template
     - .rules:build
-  tags:
-    - build
   script:
     - IDF_TARGET=esp32 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32-elf-
     - IDF_TARGET=esp32s2 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32s2-elf-
@@ -99,8 +95,6 @@ check_chip_support_components:
   extends:
     - .pre_check_template
     - .rules:build
-  tags:
-    - build
   artifacts:
     when: on_failure
     paths:
@@ -116,8 +110,6 @@ check_esp_err_to_name:
   extends:
     - .pre_check_template
     - .rules:build
-  tags:
-    - build
   artifacts:
     when: on_failure
     paths:
@@ -132,8 +124,6 @@ check_esp_system:
   extends:
     - .pre_check_template
     - .rules:build
-  tags:
-    - build
   script:
     - python components/esp_system/check_system_init_priorities.py
 
diff --git a/.gitlab/ci/static-code-analysis.yml b/.gitlab/ci/static-code-analysis.yml
index 21189b1dc5..5589ebb8e3 100644
--- a/.gitlab/ci/static-code-analysis.yml
+++ b/.gitlab/ci/static-code-analysis.yml
@@ -59,6 +59,7 @@ check_pylint:
 # sonarqube server ASAP, in order to avoid reporting unrelated code issues
 .sonar_scan_template:
   stage: build
+  extends: .pre_check_template
   image:
     name: $SONARQUBE_SCANNER_IMAGE
   before_script:
@@ -72,7 +73,6 @@ check_pylint:
     # Exclude the report dir as well
     - export EXCLUSIONS="$custom_excludes,$submodules"
     - export SONAR_SCANNER_OPTS="-Xmx2048m"
-
   variables:
     GIT_DEPTH: 0
     REPORT_PATTERN: clang_tidy_reports/*.txt
@@ -81,8 +81,6 @@ check_pylint:
     paths:
       - $REPORT_PATTERN
     expire_in: 1 week
-  tags:
-    - host_test
   dependencies:  # Here is not a hard dependency relationship, could be skipped when only python files changed. so we do not use "needs" here.
     - clang_tidy_check
     - check_pylint