diff --git a/.drone.yml b/.drone.yml
index 0d3e0648a0f..d60fecea08a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -593,6 +593,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-dashboards-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/dashboards-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/dashboards-suite
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
   depends_on:
@@ -601,6 +609,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-smoke-tests-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/smoke-tests-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/smoke-tests-suite
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite panels-suite
   depends_on:
@@ -609,6 +625,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-panels-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/panels-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/panels-suite
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite various-suite
   depends_on:
@@ -617,6 +641,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-various-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/various-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/various-suite
 - commands:
   - cd /
   - ./cpp-e2e/scripts/ci-run.sh azure ${DRONE_SOURCE_BRANCH}
@@ -1908,6 +1940,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-dashboards-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/dashboards-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/dashboards-suite
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite smoke-tests-suite
   depends_on:
@@ -1916,6 +1956,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-smoke-tests-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/smoke-tests-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/smoke-tests-suite
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite panels-suite
   depends_on:
@@ -1924,6 +1972,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-panels-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/panels-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/panels-suite
 - commands:
   - ./bin/build e2e-tests --port 3001 --suite various-suite
   depends_on:
@@ -1932,6 +1988,14 @@ steps:
     HOST: grafana-server
   image: cypress/included:13.10.0
   name: end-to-end-tests-various-suite
+- commands:
+  - ./bin/build e2e-tests --port 3001 --suite scenes/various-suite
+  depends_on:
+  - grafana-server
+  environment:
+    HOST: grafana-server
+  image: cypress/included:13.10.0
+  name: end-to-end-tests-scenes/various-suite
 - commands:
   - cd /
   - ./cpp-e2e/scripts/ci-run.sh azure ${DRONE_SOURCE_BRANCH}
@@ -4996,6 +5060,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 06f574902baa67d8885abb48e48987f675d7637e30d4b783b3bb84e51b46cdaf
+hmac: a916fba452c568a0e1d392702db3423fa52652d8d60f65f7b7aa43a7c1e952f4
 
 ...
diff --git a/e2e/run-suite b/e2e/run-suite
index 30cd8e95b55..38770c2becb 100755
--- a/e2e/run-suite
+++ b/e2e/run-suite
@@ -106,6 +106,11 @@ case "$1" in
                 ;;
         esac
       ;;
+    "scenes/"*)
+      cypressConfig[specPattern]=./e2e/"${args[0]}"/$testFilesForSingleSuite
+      cypressConfig[video]=${args[1]}
+      env[SCENES]=true
+      ;;
    "enterprise-smtp")
       env[SMTP_PLUGIN_ENABLED]=true
       cypressConfig[specPattern]=./e2e/extensions/enterprise/smtp-suite/$testFilesForSingleSuite
diff --git a/e2e/scenes/dashboard-suite/Repeating_a_panel_horizontally.spec.ts b/e2e/scenes/dashboards-suite/Repeating_a_panel_horizontally.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/Repeating_a_panel_horizontally.spec.ts
rename to e2e/scenes/dashboards-suite/Repeating_a_panel_horizontally.spec.ts
diff --git a/e2e/scenes/dashboard-suite/Repeating_a_panel_vertically.spec.ts b/e2e/scenes/dashboards-suite/Repeating_a_panel_vertically.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/Repeating_a_panel_vertically.spec.ts
rename to e2e/scenes/dashboards-suite/Repeating_a_panel_vertically.spec.ts
diff --git a/e2e/scenes/dashboard-suite/Repeating_an_empty_row.spec.ts b/e2e/scenes/dashboards-suite/Repeating_an_empty_row.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/Repeating_an_empty_row.spec.ts
rename to e2e/scenes/dashboards-suite/Repeating_an_empty_row.spec.ts
diff --git a/e2e/scenes/dashboard-suite/dashboard-browse-nested.spec.ts b/e2e/scenes/dashboards-suite/dashboard-browse-nested.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/dashboard-browse-nested.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-browse-nested.spec.ts
diff --git a/e2e/scenes/dashboard-suite/dashboard-browse.spec.ts b/e2e/scenes/dashboards-suite/dashboard-browse.spec.ts
similarity index 93%
rename from e2e/scenes/dashboard-suite/dashboard-browse.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-browse.spec.ts
index 4e9728b7a65..a5dc3cfc5ca 100644
--- a/e2e/scenes/dashboard-suite/dashboard-browse.spec.ts
+++ b/e2e/scenes/dashboards-suite/dashboard-browse.spec.ts
@@ -1,7 +1,7 @@
 import testDashboard from '../dashboards/TestDashboard.json';
 import { e2e } from '../utils';
-
-describe('Dashboard browse', () => {
+// Skipping due to race conditions with same old arch test e2e/dashboards-suite/dashboard-browse.spec.ts
+describe.skip('Dashboard browse', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
diff --git a/e2e/scenes/dashboard-suite/dashboard-live-streaming.spec.ts b/e2e/scenes/dashboards-suite/dashboard-live-streaming.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/dashboard-live-streaming.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-live-streaming.spec.ts
diff --git a/e2e/scenes/dashboard-suite/dashboard-public-create.spec.ts b/e2e/scenes/dashboards-suite/dashboard-public-create.spec.ts
similarity index 97%
rename from e2e/scenes/dashboard-suite/dashboard-public-create.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-public-create.spec.ts
index 0f90db253f9..b0f34fc4453 100644
--- a/e2e/scenes/dashboard-suite/dashboard-public-create.spec.ts
+++ b/e2e/scenes/dashboards-suite/dashboard-public-create.spec.ts
@@ -1,6 +1,6 @@
 import { e2e } from '../utils';
-
-describe('Public dashboards', () => {
+// Skipping due to race conditions with same old arch test e2e/dashboards-suite/dashboard-public-create.spec.ts
+describe.skip('Public dashboards', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
diff --git a/e2e/scenes/dashboard-suite/dashboard-public-templating.spec.ts b/e2e/scenes/dashboards-suite/dashboard-public-templating.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/dashboard-public-templating.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-public-templating.spec.ts
diff --git a/e2e/scenes/dashboard-suite/dashboard-templating.spec.ts b/e2e/scenes/dashboards-suite/dashboard-templating.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/dashboard-templating.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-templating.spec.ts
diff --git a/e2e/scenes/dashboard-suite/dashboard-time-zone.spec.ts b/e2e/scenes/dashboards-suite/dashboard-time-zone.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/dashboard-time-zone.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-time-zone.spec.ts
diff --git a/e2e/scenes/dashboard-suite/dashboard-timepicker.spec.ts b/e2e/scenes/dashboards-suite/dashboard-timepicker.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/dashboard-timepicker.spec.ts
rename to e2e/scenes/dashboards-suite/dashboard-timepicker.spec.ts
diff --git a/e2e/scenes/dashboard-suite/embedded-dashboard.spec.ts b/e2e/scenes/dashboards-suite/embedded-dashboard.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/embedded-dashboard.spec.ts
rename to e2e/scenes/dashboards-suite/embedded-dashboard.spec.ts
diff --git a/e2e/scenes/dashboard-suite/general-dashboards.spec.ts b/e2e/scenes/dashboards-suite/general-dashboards.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/general-dashboards.spec.ts
rename to e2e/scenes/dashboards-suite/general-dashboards.spec.ts
diff --git a/e2e/scenes/dashboard-suite/import-dashboard.spec.ts b/e2e/scenes/dashboards-suite/import-dashboard.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/import-dashboard.spec.ts
rename to e2e/scenes/dashboards-suite/import-dashboard.spec.ts
diff --git a/e2e/scenes/dashboard-suite/load-options-from-url.spec.ts b/e2e/scenes/dashboards-suite/load-options-from-url.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/load-options-from-url.spec.ts
rename to e2e/scenes/dashboards-suite/load-options-from-url.spec.ts
diff --git a/e2e/scenes/dashboard-suite/new-constant-variable.spec.ts b/e2e/scenes/dashboards-suite/new-constant-variable.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/new-constant-variable.spec.ts
rename to e2e/scenes/dashboards-suite/new-constant-variable.spec.ts
diff --git a/e2e/scenes/dashboard-suite/new-custom-variable.spec.ts b/e2e/scenes/dashboards-suite/new-custom-variable.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/new-custom-variable.spec.ts
rename to e2e/scenes/dashboards-suite/new-custom-variable.spec.ts
diff --git a/e2e/scenes/dashboard-suite/new-datasource-variable.spec.ts b/e2e/scenes/dashboards-suite/new-datasource-variable.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/new-datasource-variable.spec.ts
rename to e2e/scenes/dashboards-suite/new-datasource-variable.spec.ts
diff --git a/e2e/scenes/dashboard-suite/new-interval-variable.spec.ts b/e2e/scenes/dashboards-suite/new-interval-variable.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/new-interval-variable.spec.ts
rename to e2e/scenes/dashboards-suite/new-interval-variable.spec.ts
diff --git a/e2e/scenes/dashboard-suite/new-query-variable.spec.ts b/e2e/scenes/dashboards-suite/new-query-variable.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/new-query-variable.spec.ts
rename to e2e/scenes/dashboards-suite/new-query-variable.spec.ts
diff --git a/e2e/scenes/dashboard-suite/new-text-box-variable.spec.ts b/e2e/scenes/dashboards-suite/new-text-box-variable.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/new-text-box-variable.spec.ts
rename to e2e/scenes/dashboards-suite/new-text-box-variable.spec.ts
diff --git a/e2e/scenes/dashboard-suite/set-options-from-ui.spec.ts b/e2e/scenes/dashboards-suite/set-options-from-ui.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/set-options-from-ui.spec.ts
rename to e2e/scenes/dashboards-suite/set-options-from-ui.spec.ts
diff --git a/e2e/scenes/dashboard-suite/snapshot-create.spec.ts b/e2e/scenes/dashboards-suite/snapshot-create.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/snapshot-create.spec.ts
rename to e2e/scenes/dashboards-suite/snapshot-create.spec.ts
diff --git a/e2e/scenes/dashboard-suite/templating-dashboard-links-and-variables.spec.ts b/e2e/scenes/dashboards-suite/templating-dashboard-links-and-variables.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/templating-dashboard-links-and-variables.spec.ts
rename to e2e/scenes/dashboards-suite/templating-dashboard-links-and-variables.spec.ts
diff --git a/e2e/scenes/dashboard-suite/textbox-variables.spec.ts b/e2e/scenes/dashboards-suite/textbox-variables.spec.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/textbox-variables.spec.ts
rename to e2e/scenes/dashboards-suite/textbox-variables.spec.ts
diff --git a/e2e/scenes/dashboard-suite/utils/makeDashboard.ts b/e2e/scenes/dashboards-suite/utils/makeDashboard.ts
similarity index 100%
rename from e2e/scenes/dashboard-suite/utils/makeDashboard.ts
rename to e2e/scenes/dashboards-suite/utils/makeDashboard.ts
diff --git a/e2e/scenes/panels-suite/frontend-sandbox-panel.spec.ts b/e2e/scenes/panels-suite/frontend-sandbox-panel.spec.ts
index 1541be609d9..582d6ba6497 100644
--- a/e2e/scenes/panels-suite/frontend-sandbox-panel.spec.ts
+++ b/e2e/scenes/panels-suite/frontend-sandbox-panel.spec.ts
@@ -2,8 +2,8 @@ import panelSandboxDashboard from '../../dashboards/PanelSandboxDashboard.json';
 import { e2e } from '../../utils';
 
 const DASHBOARD_ID = 'c46b2460-16b7-42a5-82d1-b07fbf431950';
-
-describe('Panel sandbox', () => {
+// Skipping due to race conditions with same old arch test e2e/panels-suite/frontend-sandbox-panel.spec.ts
+describe.skip('Panel sandbox', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), true);
     return e2e.flows.importDashboard(panelSandboxDashboard, 1000, true);
diff --git a/e2e/scenes/various-suite/exemplars.spec.ts b/e2e/scenes/various-suite/exemplars.spec.ts
index da642ba3f2d..675b83039ba 100644
--- a/e2e/scenes/various-suite/exemplars.spec.ts
+++ b/e2e/scenes/various-suite/exemplars.spec.ts
@@ -17,8 +17,8 @@ const addDataSource = () => {
     },
   });
 };
-
-describe('Exemplars', () => {
+// Skipping due to race conditions with same old arch test e2e/various-suite/exemplars.spec.ts
+describe.skip('Exemplars', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
 
diff --git a/e2e/scenes/various-suite/filter-annotations.spec.ts b/e2e/scenes/various-suite/filter-annotations.spec.ts
index 883b705e8d1..35319ee1beb 100644
--- a/e2e/scenes/various-suite/filter-annotations.spec.ts
+++ b/e2e/scenes/various-suite/filter-annotations.spec.ts
@@ -1,7 +1,8 @@
 import { e2e } from '../utils';
 const DASHBOARD_ID = 'ed155665';
 
-describe('Annotations filtering', () => {
+// Skipping due to race conditions with same old arch test e2e/various-suite/filter-annotations.spec.ts
+describe.skip('Annotations filtering', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
diff --git a/e2e/scenes/various-suite/keybinds.spec.ts b/e2e/scenes/various-suite/keybinds.spec.ts
index d054edad0b7..02a45a6f42e 100644
--- a/e2e/scenes/various-suite/keybinds.spec.ts
+++ b/e2e/scenes/various-suite/keybinds.spec.ts
@@ -1,7 +1,8 @@
 import { e2e } from '../utils';
 import { fromBaseUrl } from '../utils/support/url';
 
-describe('Keyboard shortcuts', () => {
+// Skipping due to race conditions with same old arch test e2e/various-suite/keybinds.spec.ts
+describe.skip('Keyboard shortcuts', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
 
diff --git a/e2e/scenes/various-suite/loki-table-explore-to-dash.spec.ts b/e2e/scenes/various-suite/loki-table-explore-to-dash.spec.ts
index c56aa16b578..088745c7fca 100644
--- a/e2e/scenes/various-suite/loki-table-explore-to-dash.spec.ts
+++ b/e2e/scenes/various-suite/loki-table-explore-to-dash.spec.ts
@@ -110,7 +110,8 @@ const lokiQueryResult = {
   },
 };
 
-describe('Loki Query Editor', () => {
+// Skipping due to race conditions with same old arch test e2e/various-suite/loki-table-explore-to-dash.spec.ts
+describe.skip('Loki Query Editor', () => {
   beforeEach(() => {
     e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
   });
diff --git a/e2e/scenes/various-suite/prometheus-variable-editor.spec.ts b/e2e/scenes/various-suite/prometheus-variable-editor.spec.ts
index d5e90f2c31c..4b6c62427aa 100644
--- a/e2e/scenes/various-suite/prometheus-variable-editor.spec.ts
+++ b/e2e/scenes/various-suite/prometheus-variable-editor.spec.ts
@@ -77,8 +77,8 @@ function variableFlowToQueryEditor(variableName: string, queryType: string) {
     // do nothing
   }
 }
-
-describe('Prometheus variable query editor', () => {
+// Skipping due to race conditions with same old arch test e2e/various-suite/prometheus-variable-editor.spec.ts
+describe.skip('Prometheus variable query editor', () => {
   beforeEach(() => {
     createPromDS(DATASOURCE_ID, DATASOURCE_NAME);
   });
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index 395ae441ca7..c28a734330a 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -95,9 +95,13 @@ def build_e2e(trigger, ver_mode):
         [
             grafana_server_step(),
             e2e_tests_step("dashboards-suite"),
+            e2e_tests_step("scenes/dashboards-suite"),
             e2e_tests_step("smoke-tests-suite"),
+            e2e_tests_step("scenes/smoke-tests-suite"),
             e2e_tests_step("panels-suite"),
+            e2e_tests_step("scenes/panels-suite"),
             e2e_tests_step("various-suite"),
+            e2e_tests_step("scenes/various-suite"),
             cloud_plugins_e2e_tests_step(
                 "cloud-plugins-suite",
                 cloud = "azure",