diff --git a/.github/workflows/docs_metadata_check.yml b/.github/workflows/docs_metadata_check.yml
index 612a366ede..9c193bd94d 100644
--- a/.github/workflows/docs_metadata_check.yml
+++ b/.github/workflows/docs_metadata_check.yml
@@ -11,12 +11,27 @@ on:
       - 'release/**'
 
 jobs:
-  uorb-graph-check:
-    name: Check uORB graph JSONs
+  metadata-check:
+    name: ${{ matrix.name }} metadata
     runs-on: [runs-on,runner=2cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=true]
     container:
       image: ghcr.io/px4/px4-dev:v1.16.0-rc1
-
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: uORB Graphs
+            script: Tools/ci/metadata_uorb_graph.sh
+          - name: Failsafe Web
+            script: Tools/ci/metadata_failsafe_web.sh
+          - name: uORB Messages
+            script: Tools/ci/metadata_msg_docs.sh
+          - name: Parameter Reference
+            script: Tools/ci/metadata_parameters.sh
+          - name: Airframe Reference
+            script: Tools/ci/metadata_airframe.sh
+          - name: Module Reference
+            script: Tools/ci/metadata_modules.sh
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -26,95 +41,5 @@ jobs:
       - name: Mark all directories safe for Git
         run: git config --system --add safe.directory '*'
 
-      - name: Run uORB graph docs check
-        run: Tools/ci/metadata_uorb_graph.sh --test-only
-
-  failsafe-web-check:
-    name: Check failsafe web metadata files
-    runs-on: [runs-on,runner=2cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=true]
-    container:
-      image: ghcr.io/px4/px4-dev:v1.16.0-rc1
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: true
-
-      - name: Mark all directories safe for Git
-        run: git config --system --add safe.directory '*'
-
-      - name: Run failsafe web metadata check
-        run: Tools/ci/metadata_failsafe_web.sh --test-only
-
-  msg-docs-check:
-    name: Check uORB message reference docs
-    runs-on: [runs-on,runner=2cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=true]
-    container:
-      image: ghcr.io/px4/px4-dev:v1.16.0-rc1
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: true
-
-      - name: Mark all directories safe for Git
-        run: git config --system --add safe.directory '*'
-
-      - name: Run uORB message docs check
-        run: Tools/ci/metadata_msg_docs.sh --test-only
-
-  parameters-check:
-    name: Check parameter reference metadata
-    runs-on: [runs-on,runner=2cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=true]
-    container:
-      image: ghcr.io/px4/px4-dev:v1.16.0-rc1
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: true
-
-      - name: Mark all directories safe for Git
-        run: git config --system --add safe.directory '*'
-
-      - name: Run parameter docs check
-        run: Tools/ci/metadata_parameters.sh --test-only
-
-  airframe-check:
-    name: Check airframe reference metadata
-    runs-on: [runs-on,runner=2cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=true]
-    container:
-      image: ghcr.io/px4/px4-dev:v1.16.0-rc1
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: true
-
-      - name: Mark all directories safe for Git
-        run: git config --system --add safe.directory '*'
-
-      - name: Run airframe docs check
-        run: Tools/ci/metadata_airframe.sh --test-only
-
-  modules-check:
-    name: Check module reference metadata
-    runs-on: [runs-on,runner=2cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=true]
-    container:
-      image: ghcr.io/px4/px4-dev:v1.16.0-rc1
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: true
-
-      - name: Mark all directories safe for Git
-        run: git config --system --add safe.directory '*'
-
-      - name: Run module docs check
-        run: Tools/ci/metadata_modules.sh --test-only
+      - name: Run ${{ matrix.name }} metadata check
+        run: ${{ matrix.script }} --test-only