diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml
index f27b657f723..cd0bcc51d3a 100644
--- a/.github/workflows/ci-all-in-one-build.yml
+++ b/.github/workflows/ci-all-in-one-build.yml
@@ -18,6 +18,13 @@ permissions:
 jobs:
   all-in-one:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        binary:
+          - all-in-one
+          - jaeger-v2
+    name: ${{ matrix.binary }}
+
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423
@@ -49,11 +56,7 @@ jobs:
 
     - name: Build only linux/amd64 docker image for Pull Request
       if: github.ref_name != 'main'
-      run: bash scripts/build-all-in-one-image.sh pr-only
-
-    - name: Build and test jaeger-v2 as all-in-one
-      if: github.ref_name != 'main'
-      run: BINARY=jaeger-v2 bash scripts/build-all-in-one-image.sh pr-only
+      run: BINARY=${{ matrix.binary }} bash scripts/build-all-in-one-image.sh pr-only
 
     - name: Build, test, and publish all-in-one image
       if: github.ref_name == 'main'