diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml
index 30d2d574d..8637545c6 100644
--- a/.github/workflows/os-check.yml
+++ b/.github/workflows/os-check.yml
@@ -27,8 +27,8 @@ jobs:
         uses: actions/cache@v4
         id: cache-wolfssl
         with:
-          path: opt/wolfssl/${{ matrix.os }}/
-          key: wolfssh-common-wolfssl-${{ env.WOLFSSL_REF }}-${{ matrix.os }}
+          path: build-dir/
+          key: wolfssh-os-check-wolfssl-${{ env.WOLFSSL_REF }}-${{ matrix.os }}
           lookup-only: true
 
       - name: Checkout, build, and install wolfssl
@@ -42,12 +42,6 @@ jobs:
           check: false
           install: true
 
-      - shell: bash
-        if: steps.cache-wolfssl.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p opt/wolfssl
-          mv build-dir opt/wolfssl/${{ matrix.os }}
-
   build_wolfssh:
     strategy:
       fail-fast: false
@@ -68,8 +62,8 @@ jobs:
       - name: Checking cache for wolfssl
         uses: actions/cache@v4
         with:
-          path: opt/wolfssl/${{ matrix.os }}/
-          key: wolfssh-common-wolfssl-${{ env.WOLFSSL_REF }}-${{ matrix.os }}
+          path: build-dir/
+          key: wolfssh-os-check-wolfssl-${{ env.WOLFSSL_REF }}-${{ matrix.os }}
           fail-on-cache-miss: true
 
       - name: Checkout, build, and test wolfssh
@@ -77,5 +71,5 @@ jobs:
         with:
           repository: wolfssl/wolfssh
           path: wolfssh
-          configure: ${{ matrix.config }} LDFLAGS="-L${{ github.workspace }}/opt/wolfssl/${{ matrix.os }}/lib" CPPFLAGS="-I${{ github.workspace }}/opt/wolfssl/${{ matrix.os }}/include"
+          configure: ${{ matrix.config }} LDFLAGS="-L${{ github.workspace }}/build-dir/lib" CPPFLAGS="-I${{ github.workspace }}/build-dir/include"
           check: true