diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1682f86..02ca80a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,27 +22,23 @@ jobs:
           path: |
             versions_generic.old.yaml
             versions_fips.old.yaml
-  build-generic:
+  build:
     permissions:
       id-token: write  # OIDC support
       contents: write
-    uses: ./.github/workflows/reusable-build.yaml
     secrets: inherit 
-    with:
-      security_profile: generic
-  build-fips:
-    permissions:
-      id-token: write  # OIDC support
-      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        security_profile: [generic, fips]
     uses: ./.github/workflows/reusable-build.yaml
-    secrets: inherit
     with:
-      security_profile: fips
+      security_profile: ${{ matrix.security_profile }}
   comment-pr:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
-    needs: [build-generic, build-fips, get-old-versions]
+    needs: [build, get-old-versions]
     steps:
       - uses: actions/checkout@v4
       - name: Download versions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 83ec1be..d62ebb0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -8,19 +8,15 @@ on:
       - main
 
 jobs:
-  build-framework:
+  build:
     permissions:
       id-token: write  # OIDC support
       contents: write
-    uses: ./.github/workflows/reusable-build.yaml
     secrets: inherit 
-    with:
-      security_profile: generic
-  build-framework-fips:
-    permissions:
-      id-token: write  # OIDC support
-      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        security_profile: [generic, fips]
     uses: ./.github/workflows/reusable-build.yaml
-    secrets: inherit 
     with:
-      security_profile: fips
\ No newline at end of file
+      security_profile: ${{ matrix.security_profile }}
\ No newline at end of file