diff --git a/.github/workflows/pvs-studio-static-analysis.yml b/.github/workflows/pvs-studio-static-analysis.yml
index 266fcec2eb6..d3ff14e5222 100644
--- a/.github/workflows/pvs-studio-static-analysis.yml
+++ b/.github/workflows/pvs-studio-static-analysis.yml
@@ -50,9 +50,10 @@ jobs:
           download_cache_path: ${{ github.workspace }}/Build/caches
 
       - name: Build toolchain
-        if: ${{ !steps.toolchain-cache.outputs.cache-hit }}
-        run: ARCH="${{ env.PVS_STUDIO_ANALYSIS_ARCH }}" ${{ github.workspace }}/Toolchain/BuildGNU.sh
+        if: ${{ !steps.cache-restore.outputs.toolchain_prebuilt_hit }}
+        run: ${{ github.workspace }}/Toolchain/BuildGNU.sh
         env:
+          ARCH: ${{ env.PVS_STUDIO_ANALYSIS_ARCH }}
           CCACHE_DIR: ${{ env.TOOLCHAIN_CCACHE_DIR }}
 
       - name: Create build environment
diff --git a/.github/workflows/sonar-cloud-static-analysis.yml b/.github/workflows/sonar-cloud-static-analysis.yml
index 9a5d9b5ccd6..cf71d3a17f0 100644
--- a/.github/workflows/sonar-cloud-static-analysis.yml
+++ b/.github/workflows/sonar-cloud-static-analysis.yml
@@ -74,9 +74,10 @@ jobs:
           download_cache_path: ${{ github.workspace }}/Build/caches
 
       - name: Build toolchain
-        if: ${{ !steps.toolchain-cache.outputs.cache-hit }}
-        run: ARCH="${{ env.SONAR_ANALYSIS_ARCH }}" ${{ github.workspace }}/Toolchain/BuildGNU.sh
+        if: ${{ !steps.cache-restore.outputs.toolchain_prebuilt_hit }}
+        run: ${{ github.workspace }}/Toolchain/BuildGNU.sh
         env:
+          ARCH: ${{ env.SONAR_ANALYSIS_ARCH }}
           CCACHE_DIR: ${{ env.TOOLCHAIN_CCACHE_DIR }}
 
       - name: Create build environment