diff --git a/.github/workflows/build_qnx8.yml b/.github/workflows/build_qnx8.yml
index 7d412283..f460bf91 100644
--- a/.github/workflows/build_qnx8.yml
+++ b/.github/workflows/build_qnx8.yml
@@ -15,27 +15,38 @@ name: QNX8 Build
 on:
   pull_request_target:
     types: [opened, reopened, synchronize]
-  merge_group:
-    types: [checks_requested]
   push:
     branches:
       - main
+  merge_group:
+    types: [checks_requested]
+  workflow_call:
 jobs:
   qnx-build:
-    uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@c1c90b1a82a1fab0fc202979dde6686b2162d5a8 # v0.0.0
+    name: Build and Test ${{ matrix.bazel-config }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - bazel-config: x86_64-qnx
+            bazel-test-target: >-
+              //score/...
+          - bazel-config: aarch64-qnx
+            bazel-test-target: >-
+              //score/...
+            extra-bazel-test-flags: "--test_timeout=120,600,1800,7200" # Increase test timeout due to QEMU emulation
+    uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@af347722c7ae3ed85518895c11268d96ac728f62
     permissions:
       contents: read
       pull-requests: read
-    strategy:
-      matrix:
-        config: ['arm64-qnx', 'x86_64-qnx']
     with:
-      bazel-target: '//score/... //examples/...'
-      bazel-config: ${{ matrix.config }}
-      credential-helper: 'scripts/internal/qnx_creds.py'
-      environment-name: 'workflow-approval'
-      bazel-disk-cache: ${{ github.workflow }}-${{ github.job }}-${{ matrix.config }}
+      bazel-target: "//score/... //examples/..."
+      bazel-config: ${{ matrix.bazel-config }}
+      bazel-test-target: ${{ matrix.bazel-test-target }}
+      credential-helper: "scripts/internal/qnx_creds.py"
+      bazel-disk-cache: ${{ matrix.bazel-config }}
     secrets:
       score-qnx-license: ${{ secrets.SCORE_QNX_LICENSE }}
       score-qnx-user: ${{ secrets.SCORE_QNX_USER }}
       score-qnx-password: ${{ secrets.SCORE_QNX_PASSWORD }}
+