diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 87a8f284..ebeb4929 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -861,7 +861,7 @@ jobs:
     with:
       run_id: ${{ github.run_id }}
       ref: ${{ github.event.pull_request.head.ref || github.ref }}
-      run_extended: ${{(github.event_name == 'release' && github.event.action == 'created') || github.event_name == 'schedule' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'EXTENDEDTEST'))}}
+      run_extended: ${{(github.event_name == 'release' && github.event.action == 'created') || github.event_name == 'schedule' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'EXTENDEDTEST')) || startsWith(github.event.pull_request.head.ref, 'release')}}
       run_self_hosted: ${{(github.event_name == 'release' && github.event.action == 'created') || github.event_name == 'schedule' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'CNRUNNER'))}}
 
   Autotest-GUI:
@@ -872,7 +872,7 @@ jobs:
     with:
       run_id: ${{ github.run_id }}
       ref: ${{ github.event.pull_request.head.ref || github.ref }}
-      run_extended: ${{(github.event_name == 'release' && github.event.action == 'created') || github.event_name == 'schedule' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'EXTENDEDTEST'))}}
+      run_extended: ${{(github.event_name == 'release' && github.event.action == 'created') || github.event_name == 'schedule' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'EXTENDEDTEST')) || startsWith(github.event.pull_request.head.ref, 'release')}}
 
   update-release-info:
     name: Update Release Information
diff --git a/.github/workflows/build_offline_installer_archives.yaml b/.github/workflows/build_offline_installer_archives.yaml
index 32e56b17..f21006d8 100644
--- a/.github/workflows/build_offline_installer_archives.yaml
+++ b/.github/workflows/build_offline_installer_archives.yaml
@@ -583,3 +583,4 @@ jobs:
     with:
       ref: ${{ inputs.ref || github.ref }}
       run_id: ${{ github.run_id }}
+      eim_cli_run_id: ${{ (github.event_name == 'workflow_call' && inputs.run_id) || 'release' }}
diff --git a/.github/workflows/test_cli.yml b/.github/workflows/test_cli.yml
index 8d0ea454..5e9fa25a 100644
--- a/.github/workflows/test_cli.yml
+++ b/.github/workflows/test_cli.yml
@@ -248,7 +248,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.os != 'windows-latest'
         with:
-          name: autotest-CLI-results-${{ matrix.package_name }}${{ matrix.run_on == 'MirrorRunner' && '-AlternateMirrors' || '' }}${{inputs.run_self_hosted == 'true' && '-CN' || '' }}
+          name: autotest-CLI-results-${{ matrix.package_name }}${{ matrix.run_on == 'MirrorRunner' && '-AlternateMirrors' || '' }}$${{ matrix.os == 'self-hosted' && '-CN' || '' }}
           path: |
             ./tests/results-*.json
             ./tests/*.log
@@ -257,13 +257,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.os == 'windows-latest'
         with:
-          name: autotest-CLI-results-${{ matrix.package_name }}${{ matrix.run_on == 'MirrorRunner' && '-AlternateMirrors' || '' }}${inputs.run_self_hosted == 'true' && '-CN' || '' }}
+          name: autotest-CLI-results-${{ matrix.package_name }}
           path: |
             ./tests/results-*.json
             ./tests/*.log
 
       - name: Clean Up runner (Self-hosted MirrorRunner)
-        if: matrix.run_on == 'MirrorRunner' && inputs.run_self_hosted == 'true'
+        if: matrix.run_on == 'MirrorRunner' && matrix.os == 'self-hosted'
         run: |
           rm -rf ~/.local/share/eim
           rm -rf ~/runner/_work/idf-im-ui
diff --git a/.github/workflows/test_offline.yml b/.github/workflows/test_offline.yml
index 1a82c259..56e2acc9 100644
--- a/.github/workflows/test_offline.yml
+++ b/.github/workflows/test_offline.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.13"
+          python-version: "3.13.8"
 
       - name: Download Build Info files
         uses: actions/download-artifact@v5
@@ -122,6 +122,7 @@ jobs:
       - name: Run IDF offline installation (non-Windows)
         if: matrix.os != 'windows-latest'
         run: |
+          python3 --version
           export LOG_TO_FILE="true"
           export EIM_CLI_PATH="../artifacts/eim"
           export BUILD_INFO_PATH="../artifacts"
@@ -140,15 +141,10 @@ jobs:
 
           ls ./artifacts/
 
-      - name: Update Python (Windows)
-        if: matrix.os == 'windows-latest'
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.11"
-
       - name: Run IDF offline installation (Windows)
         if: matrix.os == 'windows-latest'
         run: |
+          python3 --version
           $env:LOG_TO_FILE="true"
           $env:EIM_CLI_PATH = "..\artifacts\eim.exe"
           $env:BUILD_INFO_PATH = "..\artifacts"
diff --git a/tests/scripts/CLIWizardInstall.test.js b/tests/scripts/CLIWizardInstall.test.js
index 18decf8d..8d06a7c0 100644
--- a/tests/scripts/CLIWizardInstall.test.js
+++ b/tests/scripts/CLIWizardInstall.test.js
@@ -180,7 +180,7 @@ export function runCLIWizardInstallTest({
       await new Promise((resolve) => setTimeout(resolve, 500));
 
       const selectPyPIMirror = await testRunner.waitForOutput(
-        "Select a PyPI mirror for download Python packages"
+        "Select a PyPI mirror to download Python packages"
       );
       expect(selectPyPIMirror, "Failed to ask for PyPI download mirror").to.be
         .true;