diff --git a/.github/workflows/multi-compiler.yml b/.github/workflows/multi-compiler.yml
index 422a2296..38454135 100644
--- a/.github/workflows/multi-compiler.yml
+++ b/.github/workflows/multi-compiler.yml
@@ -32,7 +32,7 @@ jobs:
           - CC: gcc-10
             CXX: g++-10
             OS: ubuntu-latest
-            wolfssl_ref: v5.7.4-stable
+            wolfssl_ref: v5.8.0-stable
           - CC: gcc-11
             CXX: g++-11
             OS: ubuntu-latest
@@ -91,7 +91,8 @@ jobs:
             openssl-source
             openssl-install
 
-          key: ossl-${{ matrix.CC }}-depends
+          key: ossl-depends-${{ matrix.wolfssl_ref }}-${{ matrix.CC }}-${{ github.sha }}
+          lookup-only: true
 
       # If not yet built this version, build it now
       - name: Build wolfProvider
diff --git a/README.md b/README.md
index f3628e28..b6ce21ce 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ The quickest method is to use the `scripts/build-wolfprovider.sh` script as foll
 It will retrieve the dependencies and compile them as necessary. To use other than the default (such as different releases) you can set various environment variables prior to calling the script:
 
 ```
-OPENSSL_TAG=openssl-3.2.0 WOLFSSL_TAG=v5.7.2-stable WOLFPROV_DEBUG=1 scripts/build-wolfprovider.sh
+OPENSSL_TAG=openssl-3.5.0 WOLFSSL_TAG=v5.8.0-stable WOLFPROV_DEBUG=1 scripts/build-wolfprovider.sh
 ```
 
 Alternatively, you can manually compile each component using the following guide.
diff --git a/scripts/build-wolfprovider.sh b/scripts/build-wolfprovider.sh
index d9478c6e..be227e78 100755
--- a/scripts/build-wolfprovider.sh
+++ b/scripts/build-wolfprovider.sh
@@ -10,8 +10,8 @@ show_help() {
   echo "Usage: $0"
   echo ""
   echo "Environment Variables:"
-  echo "  OPENSSL_TAG          OpenSSL tag to use (e.g., openssl-3.2.0)"
-  echo "  WOLFSSL_TAG          wolfSSL tag to use (e.g., v5.7.4-stable)"
+  echo "  OPENSSL_TAG          OpenSSL tag to use (e.g., openssl-3.5.0)"
+  echo "  WOLFSSL_TAG          wolfSSL tag to use (e.g., v5.8.0-stable)"
   echo "  WOLFPROV_DEBUG       If set to 1, builds OpenSSL, wolfSSL, and wolfProvider with debug options enabled"
   echo "  WOLFSSL_FIPS_BUNDLE  Directory containing the wolfSSL FIPS bundle to use instead of cloning from GitHub"
   echo "  WOLFSSL_FIPS_VERSION Version of wolfSSL FIPS bundle (v5, v6, ready), used as an argument for --enable-fips when configuring wolfSSL"
diff --git a/scripts/utils-openssl.sh b/scripts/utils-openssl.sh
index cfef2f01..15568a98 100755
--- a/scripts/utils-openssl.sh
+++ b/scripts/utils-openssl.sh
@@ -19,14 +19,14 @@
 #
 
 #
-# OpenSSL 3.0.0
+# OpenSSL 3.5.0
 #
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 source ${SCRIPT_DIR}/utils-general.sh
 
 OPENSSL_GIT="https://github.com/openssl/openssl.git"
-OPENSSL_TAG=${OPENSSL_TAG:-"openssl-3.2.0"}
+OPENSSL_TAG=${OPENSSL_TAG:-"openssl-3.5.0"}
 OPENSSL_SOURCE_DIR=${SCRIPT_DIR}/../openssl-source
 OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
 
diff --git a/scripts/utils-wolfssl.sh b/scripts/utils-wolfssl.sh
index d7f7b419..380c8021 100755
--- a/scripts/utils-wolfssl.sh
+++ b/scripts/utils-wolfssl.sh
@@ -22,7 +22,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 source ${SCRIPT_DIR}/utils-general.sh
 
 WOLFSSL_GIT=${WOLFSSL_GIT:-"https://github.com/wolfSSL/wolfssl.git"}
-WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.7.4-stable"}
+WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.8.0-stable"}
 WOLFSSL_SOURCE_DIR=${SCRIPT_DIR}/../wolfssl-source
 WOLFSSL_INSTALL_DIR=${SCRIPT_DIR}/../wolfssl-install
 WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0}