diff --git a/.github/workflows/build_qnx8.yml b/.github/workflows/build_qnx8.yml
index 224e994..f11fdf1 100644
--- a/.github/workflows/build_qnx8.yml
+++ b/.github/workflows/build_qnx8.yml
@@ -18,28 +18,17 @@ on:
   merge_group:
     types: [checks_requested]
 jobs:
-  qnx-build-arm64:
+  qnx-build:
     uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@main
     permissions:
       contents: read
       pull-requests: read
+    strategy:
+      matrix:
+        config: ['arm64-qnx', 'x86_64-qnx']
     with:
       bazel-target: '//src/...'
-      bazel-config: 'arm64-qnx'
-      credential-helper: 'scripts/internal/qnx_creds.py'
-      environment-name: 'workflow-approval'
-    secrets:
-      score-qnx-license: ${{ secrets.SCORE_QNX_LICENSE }}
-      score-qnx-user: ${{ secrets.SCORE_QNX_USER }}
-      score-qnx-password: ${{ secrets.SCORE_QNX_PASSWORD }}
-  qnx-build-x86_64:
-    uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@main
-    permissions:
-      contents: read
-      pull-requests: read
-    with:
-      bazel-target: '//src/...'
-      bazel-config: 'x86_64-qnx'
+      bazel-config: ${{ matrix.config }}
       credential-helper: 'scripts/internal/qnx_creds.py'
       environment-name: 'workflow-approval'
     secrets:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 4bb0da0..f5ee307 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -25,6 +25,8 @@ on:
   push:
     branches:
       - main
+  release:
+    types: [created]
 
 jobs:
   build-docs: