diff --git a/.github/workflows/base_images_build_windows.yml b/.github/workflows/base_images_build_windows.yml
index 099e23e3b..75d0f126e 100644
--- a/.github/workflows/base_images_build_windows.yml
+++ b/.github/workflows/base_images_build_windows.yml
@@ -323,5 +323,5 @@ jobs:
       - name: Cache image digest
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
-          path: ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}_${{ needs.init_build.outputs.current_branch }}
-          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}
+          path: ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}
+          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}-${{ needs.init_build.outputs.current_branch }}
diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index a205085cb..8636d0ed0 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -210,8 +210,8 @@ jobs:
         with:
           path: |
               ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}_${{ needs.init_build.outputs.sha_short }}
-              ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}_${{ needs.init_build.outputs.current_branch }}
-          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}
+              ${{ env.BASE_IMAGE_NAME }}_${{ matrix.os }}_${{ matrix.component }}
+          key: ${{ env.BASE_IMAGE_NAME }}-${{ matrix.os }}-${{ needs.init_build.outputs.current_branch }}
           fail-on-cache-miss: true
 
       - name: Retrieve ${{ env.BASE_IMAGE_NAME }}:${{ matrix.os }} SHA256 tag