diff --git a/.gitlab/ci/pre-check.yml b/.gitlab/ci/pre-check.yml
index d194b07..b2a8360 100644
--- a/.gitlab/ci/pre-check.yml
+++ b/.gitlab/ci/pre-check.yml
@@ -32,21 +32,11 @@ check_pre_commit:
     - if: $CI_COMMIT_BRANCH == "main"
       when: never # Skip pre-commit on main
     - when: never # Skip explicitly on other cases
-  needs: []
-  after_script: []
-
-.before_static_analyzer_build:
-  before_script:
-    - pip install --upgrade pyclang
-    - ${IDF_PATH}/tools/idf_tools.py --non-interactive install esp-clang
-    - . $IDF_PATH/export.sh
 
 build_static_analyzer_idf_latest:
   tags:
     - build
   stage: pre_check
-  extends:
-    - .before_static_analyzer_build
   image: espressif/idf:latest
   needs:
     - job: check_pre_commit
@@ -54,16 +44,16 @@ build_static_analyzer_idf_latest:
   artifacts:
     name: artifacts_${CI_JOB_NAME}
     paths:
-      - "${TEST_DIR}/**/idf_version_info.txt"
       - "${TEST_DIR}/**/warnings.txt"
       - "${TEST_DIR}/**/sdkconfig"
     when: always
     expire_in: 3 weeks
   parallel:
     matrix:
-      - !reference [.options_list, analyzers]
+      - ANALYZER_TYPE:
+        - clang
+        - gcc
   script:
-    - !reference [.check_idf_ver_script, script]
     - cd ${TEST_DIR}/examples
     - ${TEST_DIR}/tools/static_analyzer_check.sh ${ANALYZER_TYPE}
   after_script: []
diff --git a/examples/tcp/pytest_mb_tcp_master_slave.py b/examples/tcp/pytest_mb_tcp_master_slave.py
index 291f3a0..1b71aa2 100644
--- a/examples/tcp/pytest_mb_tcp_master_slave.py
+++ b/examples/tcp/pytest_mb_tcp_master_slave.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2016-2025 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2016-2026 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 
 # This is the script to reproduce the issue when the expect() is called from