diff --git a/.github/workflows/hostap.yml b/.github/workflows/hostap.yml
index d03aa5cf3..402f7b715 100644
--- a/.github/workflows/hostap.yml
+++ b/.github/workflows/hostap.yml
@@ -8,9 +8,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - build_id: build1
+          - build_id: hostap-build1
             wolf_extra_config: --disable-tls13
-          - build_id: build2
+          - build_id: hostap-build2
             wolf_extra_config: --enable-brainpool --enable-wpas-dpp
     name: Build wolfSSL
     # Just to keep it the same as the testing target
@@ -63,13 +63,13 @@ jobs:
             hostap_cherry_pick: 698c05da2bd3233b005d45873caa852bc29b32c5,
             remove_teap: true,
             # TLS 1.3 does not work for this version
-            build_id: build1,
+            build_id: hostap-build1,
           },
           # Test the dpp patch
           {
             hostap_ref: b607d2723e927a3446d89aed813f1aa6068186bb,
             osp_ref: ad5b52a49b3cc2a5bfb47ccc1d6a5137132e9446,
-            build_id: build2
+            build_id: hostap-build2
           },
         ]
         # parallelize the tests to be able to run all tests within 10 minutes
@@ -84,7 +84,7 @@ jobs:
             config: {
               hostap_ref: b607d2723e927a3446d89aed813f1aa6068186bb,
               osp_ref: ad5b52a49b3cc2a5bfb47ccc1d6a5137132e9446,
-              build_id: build2
+              build_id: hostap-build2
             }
     name: hwsim test
     # For openssl 1.1
diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml
index 38faa2481..cf943544f 100644
--- a/.github/workflows/openvpn.yml
+++ b/.github/workflows/openvpn.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Upload built lib
         uses: actions/upload-artifact@v3
         with:
-          name: wolf-install
+          name: wolf-install-openvpn
           path: build-dir
           retention-days: 1
 
@@ -36,7 +36,7 @@ jobs:
       - name: Download lib
         uses: actions/download-artifact@v3
         with:
-          name: wolf-install
+          name: wolf-install-openvpn
           path: build-dir
 
       - name: Install dependencies
diff --git a/.github/workflows/stunnel.yml b/.github/workflows/stunnel.yml
index 3ab4f7270..2f8f1de45 100644
--- a/.github/workflows/stunnel.yml
+++ b/.github/workflows/stunnel.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Upload built lib
         uses: actions/upload-artifact@v3
         with:
-          name: wolf-install
+          name: wolf-install-stunnel
           path: build-dir
           retention-days: 1
 
@@ -36,7 +36,7 @@ jobs:
       - name: Download lib
         uses: actions/download-artifact@v3
         with:
-          name: wolf-install
+          name: wolf-install-stunnel
           path: build-dir
     
       - name: Checkout OSP