diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index a6778251c0..f64ba72392 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -168,7 +168,6 @@ jobs:
 
       - name: Tilt CI - standard E2E tests
         shell: bash
-        if: ${{ inputs.run-expensive-tests == false }}
         env:
           GRAFANA_VERSION: ${{ inputs.grafana_version }}
           BROWSERS: ${{ inputs.browsers }}
diff --git a/.github/workflows/expensive-e2e-tests.yml b/.github/workflows/expensive-e2e-tests.yml
index 149697652d..2578860158 100644
--- a/.github/workflows/expensive-e2e-tests.yml
+++ b/.github/workflows/expensive-e2e-tests.yml
@@ -14,21 +14,8 @@ jobs:
     strategy:
       matrix:
         grafana_version:
-          # OnCall doesn't work on the following versions of Grafana
-          # - 8.5.22
-          # - 9.0.0
-          # - 9.1.0
-
-          # 10.0.11 is the earliest version where things work
-          # - 9.2.20
-          # - 9.3.16
-          # - 9.4.13
-          # - 9.5.7
           - 10.1.7
           - 10.3.3
-          # TODO: fix issues with running e2e tests against Grafana v10.2.x and v10.3.x
-          # - 10.2.4
-          # - latest
       fail-fast: false
       # Run one version at a time to avoid the issue when SMS notification are bundled together for multiple versions
       # running at the same time (the affected test is in grafana-plugin/e2e-tests/alerts/sms.test.ts)
@@ -37,10 +24,6 @@ jobs:
     with:
       grafana_version: ${{ matrix.grafana_version }}
       run-expensive-tests: true
-      # TODO: fix issues with some tests on firefox and webkit
-      # example CI build with firefox/webkit failing tests
-      # https://github.com/grafana/oncall/actions/runs/8022194346/job/21915964672#step:19:905
-      # browsers: "chromium firefox webkit"
       browsers: "chromium"
     secrets: inherit
 
diff --git a/Tiltfile b/Tiltfile
index 7fb40ca1b1..b0ad6724c9 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -17,6 +17,8 @@ DOCKER_REGISTRY = "localhost:63628/"
 
 load("ext://docker_build_sub", "docker_build_sub")
 
+grafana_deps = ["grafana-oncall-app-provisioning-configmap", "build-ui", "build-oncall-plugin-backend"]
+
 def get_profiles():
     profiles = os.getenv('ONCALL_PROFILES', 'grafana,plugin,backend,tests')
     return profiles.split(',')
@@ -38,6 +40,9 @@ def extra_env():
         "ONCALL_API_URL": "http://oncall-dev-engine:8080"
     }
 
+def extra_deps():
+    return grafana_deps
+    
 
 allow_k8s_contexts(["kind-kind"])
 
@@ -107,7 +112,7 @@ def load_grafana():
             context="grafana-plugin",
             plugin_files=["grafana-plugin/src/plugin.json"],
             namespace="default",
-            deps=["grafana-oncall-app-provisioning-configmap", "build-ui", "build-oncall-plugin-backend"],
+            deps=grafana_deps,
             extra_env={
                 "GF_SECURITY_ADMIN_PASSWORD": "oncall",
                 "GF_SECURITY_ADMIN_USER": "oncall",