diff --git a/.github/workflows/kyber.yml b/.github/workflows/kyber.yml
index 6c8dff7e3..4c2c38072 100644
--- a/.github/workflows/kyber.yml
+++ b/.github/workflows/kyber.yml
@@ -7,16 +7,11 @@ on:
     branches: [ '*' ]
 
 jobs:
-  run_test:
-    name: Build and run
+  build_liboqs:
+    name: Build liboqs
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 4
     steps:
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential autoconf automake libtool git cmake make
-
       - name: Install liboqs source
         run: git clone --depth 1 --branch "0.10.0" "https://github.com/open-quantum-safe/liboqs"
 
@@ -29,19 +24,61 @@ jobs:
           make
           sudo make install
 
-      - name: Install wolfSSL source
-        run: git clone --depth 1 --branch "v5.7.0-stable" "https://github.com/wolfssl/wolfssl"
+      - name: Upload liboqs
+        uses: actions/upload-artifact@v4
+        with:
+          name: wolfssh-liboqs-install
+          path: build-dir
+          retention-days: 1 
 
-      - name: Build and install wolfSSL
-        working-directory: wolfssl
-        run: |
-          autoreconf -ivf
-          ./configure --enable-wolfssh --enable-kyber --enable-experimental --enable-cryptonly --disable-examples --disable-crypttests
-          make
-          sudo make install
+  build_wolfssl:
+    name: Build wolfssl
+    runs-on: ubuntu-latest
+    timeout-minutes: 4
+    needs: build_liboqs
+    steps:
+      - name: Download liboqs
+        uses: actions/download-artifact@v4
+        with:
+          name: wolfssh-liboqs-install
+          path: build-dir
+
+      - name: Build wolfssl
+        uses: wolfSSL/actions-build-autotools-project@v1
+        with:
+          path: wolfssl
+          configure: >-
+            --enable-wolfssh --enable-kyber --enable-experimental
+            --enable-cryptonly --disable-examples --disable-crypttests
+          install: true
+
+      - name: Upload wolfssl 
+        uses: actions/upload-artifact@v4
+        with:
+          name: wolfssh-wolfssl-install
+          path: build-dir
+          retention-days: 1
+
+  build_wolfssh:
+    name: Build wolfssh
+    runs-on: ubuntu-latest
+    timeout-minutes: 4
+    needs: build_wolfssl
+    steps:
+      - name: Download liboqs
+        uses: actions/download-artifact@v4
+        with:
+          name: wolfssh-liboqs-install
+          path: build-dir
+
+      - name: Download wolfssl
+        uses: actions/download-artifact@v4
+        with:
+          name: wolfssh-wolfssl-install
+          path: build-dir
 
       - name: Install wolfSSH
-        run: git clone --depth 1 --branch "refs/pull/685/merge" "https://github.com/wolfssl/wolfssh"
+        run: git clone --depth 1 "https://github.com/wolfssl/wolfssh"
 
       - name: Build wolfSSH
         working-directory: wolfssh