diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31d193691f..318441aa65 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -239,7 +239,7 @@ jobs:
         - uses: actions/cache@v3
           with:
             path: /opt/openssl
-            key: openssl-${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-5
+            key: openssl-${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-6
           if: matrix.library.version != 'vendored'
           id: openssl-cache
         - run: |
@@ -313,16 +313,8 @@ jobs:
               make install
 
               # Copy stuff around so it's all as the build system expects.
-              mkdir -p "$OPENSSL_DIR/crypto/"
-              mkdir -p "$OPENSSL_DIR/ssl/"
-              mkdir -p "$OPENSSL_DIR/build/"
-
               cp -r ../rust/ "$OPENSSL_DIR/rust"
-              cp -r rust/ "$OPENSSL_DIR/build/rust"
-              mkdir -p "$OPENSSL_DIR/crypto/"
-              mkdir -p "$OPENSSL_DIR/ssl/"
-              cp "$OPENSSL_DIR/lib/libcrypto.a" "$OPENSSL_DIR/crypto/"
-              cp "$OPENSSL_DIR/lib/libssl.a" "$OPENSSL_DIR/ssl/"
+              cp -r ./ "$OPENSSL_DIR/build"
             esac
 
           if: matrix.library.version != 'vendored' && !steps.openssl-cache.outputs.cache-hit
@@ -347,9 +339,6 @@ jobs:
           with:
             path: target
             key: target-${{ matrix.target }}-${{ matrix.bindgen }}-${{ matrix.library.name }}-${{ matrix.library.version }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
-        - run: "ls /opt/openssl/rust/bssl-sys/../../"
-        - run: "ls /opt/openssl/rust/bssl-sys/../../build/"
-        - run: "ls /opt/openssl/rust/bssl-sys/../../build/rust/"
         - name: Run systest
           run: |
             if [[ "${{ matrix.library.version }}" == "vendored" ]]; then
@@ -364,6 +353,7 @@ jobs:
           run: |
             if [[ "${{ matrix.library.name }}" == "boringssl" && "${{ matrix.bindgen }}" != "true" ]]; then
               features="--features unstable_boringssl"
+              BORINGSSL_BUILD_DIR="$OPENSSL_DIR/build/"
             fi
             if [[ "${{ matrix.library.version }}" == "vendored" ]]; then
               features="--features vendored"