diff --git a/.drone.yml b/.drone.yml
index 75a3f76a33d..ac4f78cccd1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,7 +11,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -93,6 +93,9 @@ trigger:
   event:
   - pull_request
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on: []
 kind: pipeline
@@ -106,7 +109,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -179,6 +182,15 @@ steps:
   environment: null
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -189,14 +201,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -253,6 +300,9 @@ trigger:
   event:
   - pull_request
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on: []
 kind: pipeline
@@ -279,7 +329,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -327,6 +377,9 @@ trigger:
   event:
   - pull_request
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on: []
 kind: pipeline
@@ -353,7 +406,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -543,6 +596,15 @@ steps:
       from_secret: grafana_api_key
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -553,14 +615,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -576,7 +673,10 @@ steps:
   - gsutil -m rsync -d -r ./packages/grafana-ui/dist/storybook gs://grafana-storybook/canary
   depends_on:
   - build-storybook
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GCP_KEY:
       from_secret: gcp_key
@@ -645,7 +745,10 @@ steps:
 - commands:
   - ./scripts/circle-release-canary-packages.sh
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GITHUB_PACKAGE_TOKEN:
       from_secret: github_package_token
@@ -654,7 +757,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GCP_GRAFANA_UPLOAD_KEY:
       from_secret: gcp_key
@@ -674,6 +780,9 @@ trigger:
   event:
   - push
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - build-main
@@ -691,7 +800,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -719,6 +828,9 @@ trigger:
   event:
   - push
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - build-main
@@ -734,7 +846,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -770,6 +882,9 @@ trigger:
   event:
   - push
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - build-main
@@ -824,7 +939,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1000,6 +1115,15 @@ steps:
       from_secret: grafana_api_key
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -1010,14 +1134,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001 --tries 3
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -1070,7 +1229,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GCP_GRAFANA_UPLOAD_KEY:
       from_secret: gcp_key
@@ -1083,7 +1245,10 @@ steps:
   - gsutil -m rsync -d -r ./packages/grafana-ui/dist/storybook gs://grafana-storybook/${DRONE_TAG}
   depends_on:
   - build-storybook
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GCP_KEY:
       from_secret: gcp_key
@@ -1104,6 +1269,9 @@ trigger:
   ref:
   - refs/tags/v*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-release
@@ -1121,7 +1289,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -1148,6 +1316,9 @@ trigger:
   ref:
   - refs/tags/v*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 clone:
   disable: true
@@ -1184,7 +1355,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1411,6 +1582,15 @@ steps:
       from_secret: grafana_api_key
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -1423,14 +1603,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001 --tries 3
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -1492,7 +1707,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   - redis-integration-tests
   - memcached-integration-tests
   environment:
@@ -1534,14 +1752,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server-enterprise2
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3002 --tries 3
+  - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server-enterprise2
+  - cypress
   environment:
     HOST: end-to-end-tests-server-enterprise2
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests-enterprise2
+  name: end-to-end-tests-dashboards-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
   depends_on:
@@ -1554,7 +1807,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2
   depends_on:
-  - end-to-end-tests-enterprise2
+  - end-to-end-tests-dashboards-suite-enterprise2
+  - end-to-end-tests-panels-suite-enterprise2
+  - end-to-end-tests-smoke-tests-suite-enterprise2
+  - end-to-end-tests-various-suite-enterprise2
   - redis-integration-tests
   - memcached-integration-tests
   environment:
@@ -1566,6 +1822,9 @@ trigger:
   ref:
   - refs/tags/v*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 clone:
   disable: true
@@ -1587,7 +1846,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -1631,6 +1890,9 @@ trigger:
   ref:
   - refs/tags/v*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-release
@@ -1648,7 +1910,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1702,6 +1964,9 @@ trigger:
   ref:
   - refs/tags/v*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-release
@@ -1757,7 +2022,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1933,6 +2198,15 @@ steps:
       from_secret: grafana_api_key
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -1943,14 +2217,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001 --tries 3
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -1995,7 +2304,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads-test
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GCP_GRAFANA_UPLOAD_KEY:
       from_secret: gcp_key
@@ -2005,7 +2317,10 @@ steps:
   - echo Testing release
   depends_on:
   - build-storybook
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GCP_KEY:
       from_secret: gcp_key
@@ -2025,6 +2340,9 @@ trigger:
   event:
   - custom
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-test-release
@@ -2042,7 +2360,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -2070,6 +2388,9 @@ trigger:
   event:
   - custom
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 clone:
   disable: true
@@ -2106,7 +2427,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2333,6 +2654,15 @@ steps:
       from_secret: grafana_api_key
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -2345,14 +2675,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001 --tries 3
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -2406,7 +2771,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads-test
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   - redis-integration-tests
   - memcached-integration-tests
   environment:
@@ -2448,14 +2816,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server-enterprise2
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3002 --tries 3
+  - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server-enterprise2
+  - cypress
   environment:
     HOST: end-to-end-tests-server-enterprise2
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests-enterprise2
+  name: end-to-end-tests-dashboards-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
   depends_on:
@@ -2468,7 +2871,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-test
   depends_on:
-  - end-to-end-tests-enterprise2
+  - end-to-end-tests-dashboards-suite-enterprise2
+  - end-to-end-tests-panels-suite-enterprise2
+  - end-to-end-tests-smoke-tests-suite-enterprise2
+  - end-to-end-tests-various-suite-enterprise2
   - redis-integration-tests
   - memcached-integration-tests
   environment:
@@ -2480,6 +2886,9 @@ trigger:
   event:
   - custom
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 clone:
   disable: true
@@ -2501,7 +2910,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -2546,6 +2955,9 @@ trigger:
   event:
   - custom
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-test-release
@@ -2563,7 +2975,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2622,6 +3034,9 @@ trigger:
   event:
   - custom
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-test-release
@@ -2677,7 +3092,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2850,6 +3265,15 @@ steps:
       from_secret: grafana_api_key
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -2860,14 +3284,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001 --tries 3
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -2912,7 +3371,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   environment:
     GCP_GRAFANA_UPLOAD_KEY:
       from_secret: gcp_key
@@ -2922,6 +3384,9 @@ trigger:
   ref:
   - refs/heads/v[0-9]*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-release-branch
@@ -2939,7 +3404,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -2962,6 +3427,9 @@ trigger:
   ref:
   - refs/heads/v[0-9]*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 clone:
   disable: true
@@ -2998,7 +3466,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3220,6 +3688,15 @@ steps:
       from_secret: grafana_api_key
   image: grafana/build-container:1.4.6
   name: package
+- commands:
+  - yarn run cypress install
+  depends_on:
+  - package
+  image: grafana/ci-e2e:12.19.0-1
+  name: cypress
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./e2e/start-server
   depends_on:
@@ -3232,14 +3709,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3001 --tries 3
+  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server
+  - cypress
   environment:
     HOST: end-to-end-tests-server
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests
+  name: end-to-end-tests-dashboards-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -3302,7 +3814,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads
   depends_on:
-  - end-to-end-tests
+  - end-to-end-tests-dashboards-suite
+  - end-to-end-tests-panels-suite
+  - end-to-end-tests-smoke-tests-suite
+  - end-to-end-tests-various-suite
   - redis-integration-tests
   - memcached-integration-tests
   environment:
@@ -3344,14 +3859,49 @@ steps:
   image: grafana/build-container:1.4.6
   name: end-to-end-tests-server-enterprise2
 - commands:
-  - yarn run cypress install
-  - ./bin/grabpl e2e-tests --port 3002 --tries 3
+  - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3
   depends_on:
-  - end-to-end-tests-server-enterprise2
+  - cypress
   environment:
     HOST: end-to-end-tests-server-enterprise2
   image: grafana/ci-e2e:12.19.0-1
-  name: end-to-end-tests-enterprise2
+  name: end-to-end-tests-dashboards-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite smoke-tests-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-smoke-tests-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite panels-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-panels-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
+- commands:
+  - ./bin/grabpl e2e-tests --port 3002 --suite various-suite --tries 3
+  depends_on:
+  - cypress
+  environment:
+    HOST: end-to-end-tests-server-enterprise2
+  image: grafana/ci-e2e:12.19.0-1
+  name: end-to-end-tests-various-suite-enterprise2
+  volumes:
+  - name: cypress_cache
+    path: /root/.cache/Cypress
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "grafana-static-assets"
   depends_on:
@@ -3364,7 +3914,10 @@ steps:
 - commands:
   - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2
   depends_on:
-  - end-to-end-tests-enterprise2
+  - end-to-end-tests-dashboards-suite-enterprise2
+  - end-to-end-tests-panels-suite-enterprise2
+  - end-to-end-tests-smoke-tests-suite-enterprise2
+  - end-to-end-tests-various-suite-enterprise2
   - redis-integration-tests
   - memcached-integration-tests
   environment:
@@ -3376,6 +3929,9 @@ trigger:
   ref:
   - refs/heads/v[0-9]*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 clone:
   disable: true
@@ -3397,7 +3953,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.2/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -3437,6 +3993,9 @@ trigger:
   ref:
   - refs/heads/v[0-9]*
 type: docker
+volumes:
+- name: cypress_cache
+  temp: {}
 ---
 depends_on:
 - oss-build-release-branch
@@ -3599,6 +4158,6 @@ kind: secret
 name: drone_token
 ---
 kind: signature
-hmac: e88015b452dfab871767948389489cbbf94d34e79054a4c0e251b5d828780269
+hmac: d278fbd1a0bbcc1789f43a04091dfd087aac405da5d54fe455404719ffb44699
 
 ...
diff --git a/e2e/suite1/dashboards/TestDashboard.json b/e2e/dashboards-suite/dashboards/TestDashboard.json
similarity index 100%
rename from e2e/suite1/dashboards/TestDashboard.json
rename to e2e/dashboards-suite/dashboards/TestDashboard.json
diff --git a/e2e/suite1/specs/dashboard-templating.spec.ts b/e2e/dashboards-suite/specs/dashboard-templating.spec.ts
similarity index 100%
rename from e2e/suite1/specs/dashboard-templating.spec.ts
rename to e2e/dashboards-suite/specs/dashboard-templating.spec.ts
diff --git a/e2e/suite1/specs/dashboard-time-zone.spec.ts b/e2e/dashboards-suite/specs/dashboard-time-zone.spec.ts
similarity index 100%
rename from e2e/suite1/specs/dashboard-time-zone.spec.ts
rename to e2e/dashboards-suite/specs/dashboard-time-zone.spec.ts
diff --git a/e2e/suite1/specs/import-dashboard.spec.ts b/e2e/dashboards-suite/specs/import-dashboard.spec.ts
similarity index 100%
rename from e2e/suite1/specs/import-dashboard.spec.ts
rename to e2e/dashboards-suite/specs/import-dashboard.spec.ts
diff --git a/e2e/suite1/specs/templating-dashboard-links-and-variables.ts b/e2e/dashboards-suite/specs/templating-dashboard-links-and-variables.ts
similarity index 100%
rename from e2e/suite1/specs/templating-dashboard-links-and-variables.ts
rename to e2e/dashboards-suite/specs/templating-dashboard-links-and-variables.ts
diff --git a/e2e/suite1/specs/panelEdit_base.spec.ts b/e2e/panels-suite/specs/panelEdit_base.spec.ts
similarity index 100%
rename from e2e/suite1/specs/panelEdit_base.spec.ts
rename to e2e/panels-suite/specs/panelEdit_base.spec.ts
diff --git a/e2e/suite1/specs/panelEdit_queries.spec.ts b/e2e/panels-suite/specs/panelEdit_queries.spec.ts
similarity index 100%
rename from e2e/suite1/specs/panelEdit_queries.spec.ts
rename to e2e/panels-suite/specs/panelEdit_queries.spec.ts
diff --git a/e2e/suite1/specs/panelEdit_transforms.spec.ts b/e2e/panels-suite/specs/panelEdit_transforms.spec.ts
similarity index 100%
rename from e2e/suite1/specs/panelEdit_transforms.spec.ts
rename to e2e/panels-suite/specs/panelEdit_transforms.spec.ts
diff --git a/e2e/run-suite b/e2e/run-suite
index f9fad1f8da3..bd172850cdc 100755
--- a/e2e/run-suite
+++ b/e2e/run-suite
@@ -8,11 +8,12 @@ PORT=${PORT:-$DEFAULT_PORT}
 
 echo -e "Starting Cypress scenarios"
 
+args=("$@")
+
 CMD="start"
 PARAMS=""
 SLOWMO=0
 URL=${BASE_URL:-"http://$HOST:$PORT"}
-SUITE=${SUITE:-$DEFAULT_SUITE}
 
 if [ "$1" == "debug" ]; then
     echo -e "Debug mode"
@@ -28,5 +29,5 @@ fi
 cd packages/grafana-e2e
 
 yarn $CMD --env BASE_URL=$URL,SLOWMO=$SLOWMO \
-  --config defaultCommandTimeout=30000,integrationFolder=../../e2e/$SUITE/specs,screenshotsFolder=../../e2e/$SUITE/screenshots,videosFolder=../../e2e/$SUITE/videos,fileServerFolder=./cypress,viewportWidth=1920,viewportHeight=1080,trashAssetsBeforeRuns=false,videoUploadOnPasses=false \
+  --config defaultCommandTimeout=30000,integrationFolder=../../e2e/"${args[0]}"/specs,screenshotsFolder=../../e2e"${args[0]}"/screenshots,videosFolder=../../e2e/"${args[0]}"/videos,fileServerFolder=./cypress,viewportWidth=1920,viewportHeight=1080,trashAssetsBeforeRuns=false,videoUploadOnPasses=false \
   $PARAMS
diff --git a/e2e/suite1/tsconfig.json b/e2e/shared/tsconfig.json
similarity index 100%
rename from e2e/suite1/tsconfig.json
rename to e2e/shared/tsconfig.json
diff --git a/e2e/suite1/specs/1-smoketests.spec.ts b/e2e/smoke-tests-suite/specs/1-smoketests.spec.ts
similarity index 100%
rename from e2e/suite1/specs/1-smoketests.spec.ts
rename to e2e/smoke-tests-suite/specs/1-smoketests.spec.ts
diff --git a/e2e/suite1/specs/variables/load-options-from-url.ts b/e2e/smoke-tests-suite/specs/variables/load-options-from-url.ts
similarity index 100%
rename from e2e/suite1/specs/variables/load-options-from-url.ts
rename to e2e/smoke-tests-suite/specs/variables/load-options-from-url.ts
diff --git a/e2e/suite1/specs/variables/new-query-variable.ts b/e2e/smoke-tests-suite/specs/variables/new-query-variable.ts
similarity index 100%
rename from e2e/suite1/specs/variables/new-query-variable.ts
rename to e2e/smoke-tests-suite/specs/variables/new-query-variable.ts
diff --git a/e2e/suite1/specs/variables/set-options-from-ui.ts b/e2e/smoke-tests-suite/specs/variables/set-options-from-ui.ts
similarity index 100%
rename from e2e/suite1/specs/variables/set-options-from-ui.ts
rename to e2e/smoke-tests-suite/specs/variables/set-options-from-ui.ts
diff --git a/e2e/suite1/specs/variables/textbox-variables.ts b/e2e/smoke-tests-suite/specs/variables/textbox-variables.ts
similarity index 100%
rename from e2e/suite1/specs/variables/textbox-variables.ts
rename to e2e/smoke-tests-suite/specs/variables/textbox-variables.ts
diff --git a/e2e/suite1/screenshots/bar-gauge.spec.ts/bar-gauge-gradient (1).png b/e2e/suite1/screenshots/bar-gauge.spec.ts/bar-gauge-gradient (1).png
deleted file mode 100644
index 08b192e69a3..00000000000
Binary files a/e2e/suite1/screenshots/bar-gauge.spec.ts/bar-gauge-gradient (1).png and /dev/null differ
diff --git a/e2e/suite1/screenshots/bar-gauge.spec.ts/bar-gauge-gradient.png b/e2e/suite1/screenshots/bar-gauge.spec.ts/bar-gauge-gradient.png
deleted file mode 100644
index e15f82cb14b..00000000000
Binary files a/e2e/suite1/screenshots/bar-gauge.spec.ts/bar-gauge-gradient.png and /dev/null differ
diff --git a/e2e/suite1/screenshots/expected/bar-gauge-gradient.png b/e2e/suite1/screenshots/expected/bar-gauge-gradient.png
deleted file mode 100644
index e15f82cb14b..00000000000
Binary files a/e2e/suite1/screenshots/expected/bar-gauge-gradient.png and /dev/null differ
diff --git a/e2e/variables b/e2e/variables
index df5042a57d1..13fa4bf360b 100644
--- a/e2e/variables
+++ b/e2e/variables
@@ -8,4 +8,3 @@ DEFAULT_PACKAGE_FILE=dist/grafana-*linux-amd64.tar.gz
 PROV_DIR=$RUNDIR/conf/provisioning
 DEFAULT_HOST=localhost
 DEFAULT_PORT=3001
-DEFAULT_SUITE=suite1
diff --git a/e2e/suite1/specs/bar-gauge.spec.ts b/e2e/various-suite/specs/bar-gauge.spec.ts
similarity index 100%
rename from e2e/suite1/specs/bar-gauge.spec.ts
rename to e2e/various-suite/specs/bar-gauge.spec.ts
diff --git a/e2e/suite1/specs/exemplars.spec.ts b/e2e/various-suite/specs/exemplars.spec.ts
similarity index 100%
rename from e2e/suite1/specs/exemplars.spec.ts
rename to e2e/various-suite/specs/exemplars.spec.ts
diff --git a/e2e/suite1/specs/explore.spec.ts b/e2e/various-suite/specs/explore.spec.ts
similarity index 100%
rename from e2e/suite1/specs/explore.spec.ts
rename to e2e/various-suite/specs/explore.spec.ts
diff --git a/e2e/suite1/specs/gauge.spec.ts b/e2e/various-suite/specs/gauge.spec.ts
similarity index 100%
rename from e2e/suite1/specs/gauge.spec.ts
rename to e2e/various-suite/specs/gauge.spec.ts
diff --git a/e2e/suite1/specs/inspect-drawer.spec.ts b/e2e/various-suite/specs/inspect-drawer.spec.ts
similarity index 100%
rename from e2e/suite1/specs/inspect-drawer.spec.ts
rename to e2e/various-suite/specs/inspect-drawer.spec.ts
diff --git a/e2e/suite1/specs/pie-chart.spec.ts b/e2e/various-suite/specs/pie-chart.spec.ts
similarity index 100%
rename from e2e/suite1/specs/pie-chart.spec.ts
rename to e2e/various-suite/specs/pie-chart.spec.ts
diff --git a/e2e/suite1/specs/query-editor.spec.ts b/e2e/various-suite/specs/query-editor.spec.ts
similarity index 100%
rename from e2e/suite1/specs/query-editor.spec.ts
rename to e2e/various-suite/specs/query-editor.spec.ts
diff --git a/e2e/suite1/specs/select-focus.spec.ts b/e2e/various-suite/specs/select-focus.spec.ts
similarity index 100%
rename from e2e/suite1/specs/select-focus.spec.ts
rename to e2e/various-suite/specs/select-focus.spec.ts
diff --git a/e2e/suite1/specs/solo-route.spec.ts b/e2e/various-suite/specs/solo-route.spec.ts
similarity index 100%
rename from e2e/suite1/specs/solo-route.spec.ts
rename to e2e/various-suite/specs/solo-route.spec.ts
diff --git a/e2e/suite1/specs/trace-view-scrolling.spec.ts b/e2e/various-suite/specs/trace-view-scrolling.spec.ts
similarity index 100%
rename from e2e/suite1/specs/trace-view-scrolling.spec.ts
rename to e2e/various-suite/specs/trace-view-scrolling.spec.ts
diff --git a/e2e/suite1/specs/visualization-suggestions.ts b/e2e/various-suite/specs/visualization-suggestions.ts
similarity index 100%
rename from e2e/suite1/specs/visualization-suggestions.ts
rename to e2e/various-suite/specs/visualization-suggestions.ts
diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star
index 91c1ed9b99b..3f480f72e82 100644
--- a/scripts/drone/pipelines/main.star
+++ b/scripts/drone/pipelines/main.star
@@ -14,6 +14,7 @@ load(
     'build_frontend_step',
     'build_plugins_step',
     'package_step',
+    'install_cypress_step',
     'e2e_tests_server_step',
     'e2e_tests_step',
     'build_storybook_step',
@@ -86,8 +87,12 @@ def get_steps(edition, is_downstream=False):
     # Insert remaining steps
     steps.extend([
         package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, is_downstream=is_downstream),
+        install_cypress_step(),
         e2e_tests_server_step(edition=edition),
-        e2e_tests_step(edition=edition),
+        e2e_tests_step('dashboards-suite', edition=edition),
+        e2e_tests_step('smoke-tests-suite', edition=edition),
+        e2e_tests_step('panels-suite', edition=edition),
+        e2e_tests_step('various-suite', edition=edition),
         build_storybook_step(edition=edition, ver_mode=ver_mode),
         publish_storybook_step(edition=edition, ver_mode=ver_mode),
         test_a11y_frontend_step(ver_mode=ver_mode, edition=edition),
@@ -113,6 +118,10 @@ def get_steps(edition, is_downstream=False):
             package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64'], is_downstream=is_downstream),
             e2e_tests_server_step(edition=edition2, port=3002),
             e2e_tests_step(edition=edition2, port=3002),
+            e2e_tests_step('dashboards-suite', edition=edition2, port=3002),
+            e2e_tests_step('smoke-tests-suite', edition=edition2, port=3002),
+            e2e_tests_step('panels-suite', edition=edition2, port=3002),
+            e2e_tests_step('various-suite', edition=edition2, port=3002),
             upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream),
             upload_cdn_step(edition=edition2)
         ])
diff --git a/scripts/drone/pipelines/pr.star b/scripts/drone/pipelines/pr.star
index f5df7fedf17..6cd87828139 100644
--- a/scripts/drone/pipelines/pr.star
+++ b/scripts/drone/pipelines/pr.star
@@ -14,6 +14,7 @@ load(
     'test_backend_integration_step',
     'test_frontend_step',
     'package_step',
+    'install_cypress_step',
     'e2e_tests_server_step',
     'e2e_tests_step',
     'build_storybook_step',
@@ -86,8 +87,12 @@ def pr_pipelines(edition):
     # Insert remaining build_steps
     build_steps.extend([
         package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=variants),
+        install_cypress_step(),
         e2e_tests_server_step(edition=edition),
-        e2e_tests_step(edition=edition),
+        e2e_tests_step('dashboards-suite', edition=edition),
+        e2e_tests_step('smoke-tests-suite', edition=edition),
+        e2e_tests_step('panels-suite', edition=edition),
+        e2e_tests_step('various-suite', edition=edition),
         build_storybook_step(edition=edition, ver_mode=ver_mode),
         test_a11y_frontend_step(ver_mode=ver_mode, edition=edition),
         build_frontend_docs_step(edition=edition),
@@ -105,6 +110,10 @@ def pr_pipelines(edition):
             package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']),
             e2e_tests_server_step(edition=edition2, port=3002),
             e2e_tests_step(edition=edition2, port=3002),
+            e2e_tests_step('dashboards-suite', edition=edition2, port=3002),
+            e2e_tests_step('smoke-tests-suite', edition=edition2, port=3002),
+            e2e_tests_step('panels-suite', edition=edition2, port=3002),
+            e2e_tests_step('various-suite', edition=edition2, port=3002),
         ])
 
     trigger = {
diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star
index b2aca6bd34e..ab33fc08b9b 100644
--- a/scripts/drone/pipelines/release.star
+++ b/scripts/drone/pipelines/release.star
@@ -17,6 +17,7 @@ load(
     'build_frontend_step',
     'build_plugins_step',
     'package_step',
+    'install_cypress_step',
     'e2e_tests_server_step',
     'e2e_tests_step',
     'build_storybook_step',
@@ -114,8 +115,12 @@ def get_steps(edition, ver_mode):
     # Insert remaining steps
     build_steps.extend([
         package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2),
+        install_cypress_step(),
         e2e_tests_server_step(edition=edition),
-        e2e_tests_step(edition=edition, tries=3),
+        e2e_tests_step('dashboards-suite', edition=edition, tries=3),
+        e2e_tests_step('smoke-tests-suite', edition=edition, tries=3),
+        e2e_tests_step('panels-suite', edition=edition, tries=3),
+        e2e_tests_step('various-suite', edition=edition, tries=3),
         copy_packages_for_docker_step(),
         build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
         build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=should_publish),
@@ -145,7 +150,10 @@ def get_steps(edition, ver_mode):
         publish_steps.extend([
             package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']),
             e2e_tests_server_step(edition=edition2, port=3002),
-            e2e_tests_step(edition=edition2, port=3002, tries=3),
+            e2e_tests_step('dashboards-suite', edition=edition2, port=3002, tries=3),
+            e2e_tests_step('smoke-tests-suite', edition=edition2, port=3002, tries=3),
+            e2e_tests_step('panels-suite', edition=edition2, port=3002, tries=3),
+            e2e_tests_step('various-suite', edition=edition2, port=3002, tries=3),
             upload_cdn_step(edition=edition2),
         ])
         if should_upload:
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index cf94c66f175..541d0133cb4 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1,6 +1,6 @@
 load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token')
 
-grabpl_version = '2.7.1'
+grabpl_version = '2.7.2'
 build_image = 'grafana/build-container:1.4.6'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
@@ -276,7 +276,10 @@ def publish_storybook_step(edition, ver_mode):
         'image': publish_image,
         'depends_on': [
             'build-storybook',
-            'end-to-end-tests',
+            'end-to-end-tests-dashboards-suite',
+            'end-to-end-tests-panels-suite',
+            'end-to-end-tests-smoke-tests-suite',
+            'end-to-end-tests-various-suite',
         ],
         'environment': {
             'GCP_KEY': from_secret('gcp_key'),
@@ -650,24 +653,40 @@ def e2e_tests_server_step(edition, port=3001):
         ],
     }
 
+def install_cypress_step():
+    return {
+        'name': 'cypress',
+        'image': 'grafana/ci-e2e:12.19.0-1',
+        'depends_on': [
+            'package',
+            ],
+        'commands': [
+            'yarn run cypress install',
+        ],
+        'volumes': [{
+            'name': 'cypress_cache',
+            'path': '/root/.cache/Cypress'
+        }],
+    }
 
-def e2e_tests_step(edition, port=3001, tries=None):
-    cmd = './bin/grabpl e2e-tests --port {}'.format(port)
+def e2e_tests_step(suite, edition, port=3001, tries=None):
+    cmd = './bin/grabpl e2e-tests --port {} --suite {}'.format(port, suite)
     if tries:
         cmd += ' --tries {}'.format(tries)
     return {
-        'name': 'end-to-end-tests' + enterprise2_suffix(edition),
+        'name': 'end-to-end-tests-{}'.format(suite) + enterprise2_suffix(edition),
         'image': 'grafana/ci-e2e:12.19.0-1',
         'depends_on': [
-            'end-to-end-tests-server' + enterprise2_suffix(edition),
+            'cypress',
         ],
         'environment': {
             'HOST': 'end-to-end-tests-server' + enterprise2_suffix(edition),
         },
+        'volumes': [{
+            'name': 'cypress_cache',
+            'path': '/root/.cache/Cypress'
+        }],
         'commands': [
-            # Have to re-install Cypress since it insists on searching for its binary beneath /root/.cache,
-            # even though the Yarn cache directory is beneath /usr/local/share somewhere
-            'yarn run cypress install',
             cmd,
         ],
     }
@@ -832,7 +851,10 @@ def release_canary_npm_packages_step(edition):
         'name': 'release-canary-npm-packages',
         'image': build_image,
         'depends_on': [
-            'end-to-end-tests',
+            'end-to-end-tests-dashboards-suite',
+            'end-to-end-tests-panels-suite',
+            'end-to-end-tests-smoke-tests-suite',
+            'end-to-end-tests-various-suite',
         ],
         'environment': {
             'GITHUB_PACKAGE_TOKEN': from_secret('github_package_token'),
@@ -862,7 +884,10 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
         cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket)
 
     dependencies = [
-        'end-to-end-tests' + enterprise2_suffix(edition),
+        'end-to-end-tests-dashboards-suite' + enterprise2_suffix(edition),
+        'end-to-end-tests-panels-suite' + enterprise2_suffix(edition),
+        'end-to-end-tests-smoke-tests-suite' + enterprise2_suffix(edition),
+        'end-to-end-tests-various-suite' + enterprise2_suffix(edition),
     ]
 
     if edition in ('enterprise', 'enterprise2'):
diff --git a/scripts/drone/utils/utils.star b/scripts/drone/utils/utils.star
index 2701c6e6a9d..517bbde2975 100644
--- a/scripts/drone/utils/utils.star
+++ b/scripts/drone/utils/utils.star
@@ -37,6 +37,10 @@ def pipeline(
         'trigger': trigger,
         'services': services,
         'steps': steps,
+        'volumes': [{
+            'name': 'cypress_cache',
+            'temp': {},
+        }],
         'depends_on': depends_on,
     }
     pipeline.update(platform_conf)