diff --git a/.github/workflows/build-and-unit-tests-wrapper.yaml b/.github/workflows/build-and-unit-tests-wrapper.yaml
index 7869e0530e72..1d9dc7678739 100644
--- a/.github/workflows/build-and-unit-tests-wrapper.yaml
+++ b/.github/workflows/build-and-unit-tests-wrapper.yaml
@@ -7,24 +7,19 @@ jobs:
   build-artifact:
     uses: ./.github/workflows/build-artifact.yaml
     secrets: inherit
-  sd-unit-tests-gs:
+
+  sd-unit-tests:
     needs: build-artifact
-    uses: ./.github/workflows/build-and-unit-tests.yaml
     secrets: inherit
-    with:
-      arch: grayskull
-      runner-label: E150
-  sd-unit-tests-n150:
-    needs: build-artifact
+    strategy:
+      fail-fast: false
+      matrix:
+        test-group: [
+          { arch: grayskull, runner-label: E150 },
+          { arch: wormhole_b0, runner-label: N150 },
+          { arch: wormhole_b0, runner-label: N300 },
+        ]
     uses: ./.github/workflows/build-and-unit-tests.yaml
-    secrets: inherit
-    with:
-      arch: wormhole_b0
-      runner-label: N150
-  sd-unit-tests-n300:
-    needs: build-artifact
-    uses: ./.github/workflows/build-and-unit-tests.yaml
-    secrets: inherit
     with:
-      arch: wormhole_b0
-      runner-label: N300
+      arch: ${{ matrix.test-group.arch}}
+      runner-label: ${{ matrix.test-group.runner-label}}
diff --git a/.github/workflows/cpp-post-commit-wrapper.yaml b/.github/workflows/cpp-post-commit-wrapper.yaml
index 7d84830596bd..cdc99fd5e43a 100644
--- a/.github/workflows/cpp-post-commit-wrapper.yaml
+++ b/.github/workflows/cpp-post-commit-wrapper.yaml
@@ -11,24 +11,18 @@ jobs:
   build-artifact:
     uses: ./.github/workflows/build-artifact.yaml
     secrets: inherit
-  cpp-unit-tests-e150:
+  cpp-unit-tests:
     needs: build-artifact
-    uses: ./.github/workflows/cpp-post-commit.yaml
-    secrets: inherit
-    with:
-      arch: grayskull
-      runner-label: E150
-  cpp-unit-tests-n150:
-    needs: build-artifact
-    uses: ./.github/workflows/cpp-post-commit.yaml
     secrets: inherit
-    with:
-      arch: wormhole_b0
-      runner-label: N150
-  cpp-unit-tests-n300:
-    needs: build-artifact
+    strategy:
+      fail-fast: false
+      matrix:
+        test-group: [
+          { arch: grayskull, runner-label: E150 },
+          { arch: wormhole_b0, runner-label: N150 },
+          { arch: wormhole_b0, runner-label: N300 },
+        ]
     uses: ./.github/workflows/cpp-post-commit.yaml
-    secrets: inherit
     with:
-      arch: wormhole_b0
-      runner-label: N300
+      arch: ${{ matrix.test-group.arch}}
+      runner-label: ${{ matrix.test-group.runner-label}}
diff --git a/.github/workflows/models-post-commit-wrapper.yaml b/.github/workflows/models-post-commit-wrapper.yaml
index 272ecbc05802..be31f38a4cef 100644
--- a/.github/workflows/models-post-commit-wrapper.yaml
+++ b/.github/workflows/models-post-commit-wrapper.yaml
@@ -11,24 +11,18 @@ jobs:
   build-artifact:
     uses: ./.github/workflows/build-artifact.yaml
     secrets: inherit
-  models-unit-tests-e150:
+  models-unit-tests:
     needs: build-artifact
-    uses: ./.github/workflows/models-post-commit.yaml
-    secrets: inherit
-    with:
-      arch: grayskull
-      runner-label: E150
-  models-unit-tests-n150:
-    needs: build-artifact
-    uses: ./.github/workflows/models-post-commit.yaml
     secrets: inherit
-    with:
-      arch: wormhole_b0
-      runner-label: N150
-  models-unit-tests-n300:
-    needs: build-artifact
+    strategy:
+      fail-fast: false
+      matrix:
+        test-group: [
+          { arch: grayskull, runner-label: E150 },
+          { arch: wormhole_b0, runner-label: N150 },
+          { arch: wormhole_b0, runner-label: N300 },
+        ]
     uses: ./.github/workflows/models-post-commit.yaml
-    secrets: inherit
     with:
-      arch: wormhole_b0
-      runner-label: N300
+      arch: ${{ matrix.test-group.arch}}
+      runner-label: ${{ matrix.test-group.runner-label}}
diff --git a/.github/workflows/ttnn-post-commit-wrapper.yaml b/.github/workflows/ttnn-post-commit-wrapper.yaml
index 9c57eede3f9d..b94be9dd0e3d 100644
--- a/.github/workflows/ttnn-post-commit-wrapper.yaml
+++ b/.github/workflows/ttnn-post-commit-wrapper.yaml
@@ -11,24 +11,18 @@ jobs:
   build-artifact:
     uses: ./.github/workflows/build-artifact.yaml
     secrets: inherit
-  ttnn-unit-tests-e150:
+  ttnn-unit-tests:
     needs: build-artifact
-    uses: ./.github/workflows/ttnn-post-commit.yaml
-    secrets: inherit
-    with:
-      arch: grayskull
-      runner-label: E150
-  ttnn-unit-tests-n150:
-    needs: build-artifact
-    uses: ./.github/workflows/ttnn-post-commit.yaml
     secrets: inherit
-    with:
-      arch: wormhole_b0
-      runner-label: N150
-  ttnn-unit-tests-n300:
-    needs: build-artifact
+    strategy:
+      fail-fast: false
+      matrix:
+        test-group: [
+          { arch: grayskull, runner-label: E150 },
+          { arch: wormhole_b0, runner-label: N150 },
+          { arch: wormhole_b0, runner-label: N300 },
+        ]
     uses: ./.github/workflows/ttnn-post-commit.yaml
-    secrets: inherit
     with:
-      arch: wormhole_b0
-      runner-label: N300
+      arch: ${{ matrix.test-group.arch}}
+      runner-label: ${{ matrix.test-group.runner-label}}