diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b8a8840994b..050e18e7895 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -823,8 +823,8 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/pr-frontend-unit-tests.yml @grafana/grafana-frontend-platform
 /.github/workflows/frontend-lint.yml @grafana/grafana-frontend-platform
 /.github/workflows/analytics-events-report.yml @grafana/grafana-frontend-platform
-/.github/workflows/e2e-suite-various.yml @grafana/grafana-developer-enablement-squad
 /.github/workflows/pr-e2e-tests.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/run-e2e-suite.yml @grafana/grafana-developer-enablement-squad
 
 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
diff --git a/.github/workflows/pr-e2e-tests.yml b/.github/workflows/pr-e2e-tests.yml
index c18f156c39a..cb57210abb0 100644
--- a/.github/workflows/pr-e2e-tests.yml
+++ b/.github/workflows/pr-e2e-tests.yml
@@ -39,10 +39,33 @@ jobs:
           retention-days: 1
           name: ${{ steps.artifact.outputs.artifact }}
           path: grafana.tar.gz
-  misc-suite:
+  e2e-matrix:
+    name: ${{ matrix.suite }}
+    strategy:
+      matrix:
+        suite:
+          - various-suite
+          - dashboards-suite
+          - smoke-tests-suite
+          - panels-suite
     needs:
       - build-grafana
-    uses: ./.github/workflows/e2e-suite-various.yml
-    name: Various Suite
+    uses: ./.github/workflows/run-e2e-suite.yml
     with:
       package: ${{ needs.build-grafana.outputs.artifact }}
+      suite: ${{ matrix.suite }}
+  e2e-matrix-old-arch:
+    name: ${{ matrix.suite }} (old arch)
+    strategy:
+      matrix:
+        suite:
+          - old-arch/various-suite
+          - old-arch/dashboards-suite
+          - old-arch/smoke-tests-suite
+          - old-arch/panels-suite
+    needs:
+      - build-grafana
+    uses: ./.github/workflows/run-e2e-suite.yml
+    with:
+      package: ${{ needs.build-grafana.outputs.artifact }}
+      suite: ${{ matrix.suite }}
diff --git a/.github/workflows/e2e-suite-various.yml b/.github/workflows/run-e2e-suite.yml
similarity index 61%
rename from .github/workflows/e2e-suite-various.yml
rename to .github/workflows/run-e2e-suite.yml
index ff7a69cfe48..8c3c5851325 100644
--- a/.github/workflows/e2e-suite-various.yml
+++ b/.github/workflows/run-e2e-suite.yml
@@ -1,4 +1,4 @@
-name: suites / various
+name: e2e suite
 
 on:
   workflow_call:
@@ -6,6 +6,9 @@ on:
       package:
         type: string
         required: true
+      suite:
+        type: string
+        required: true
 
 jobs:
   main:
@@ -16,12 +19,14 @@ jobs:
         with:
           name: ${{ inputs.package }}
       - uses: dagger/dagger-for-github@8.0.0
+        if: inputs.old-arch == false
         with:
           verb: run
-          args: go run ./pkg/build/e2e --package=grafana.tar.gz --suite=various-suite
+          args: go run ./pkg/build/e2e --package=grafana.tar.gz --suite=${{ inputs.suite }}
+      - run: echo "suite=$(echo ${{ inputs.suite }} | sed 's/\//-/g')" >> $GITHUB_ENV
       - uses: actions/upload-artifact@v4
-        if: always()
+        if: ${{ always() && inputs.old-arch != true }}
         with:
-          name: e2e-various-${{github.run_number}}
+          name: e2e-${{ env.suite }}-${{github.run_number}}
           path: videos
           retention-days: 1