diff --git a/.buildkite/runtime-tests.yml b/.buildkite/runtime-tests.yml
index 56919646dbf..e4bf47c2e95 100644
--- a/.buildkite/runtime-tests.yml
+++ b/.buildkite/runtime-tests.yml
@@ -7,17 +7,13 @@ steps:
       - "be_cmd node_deps -- npx yarn install"
       - "be_cmd run_tests -- ts-node ./packages/e2e-tests/scripts/buildkite_run_tests_from_reason-linux-x86_64.ts"
     agents:
-      - "deploy=true"
+      - "e2e=true"
     plugins:
       - seek-oss/aws-sm#v2.3.1:
           region: us-east-2
           env:
             AUTOMATED_TEST_SECRET: "graphql-automated-test-secret"
             RECORD_REPLAY_API_KEY: "runtime-record-replay-api-key"
-            FLY_API_TOKEN: "prod/fly-api-token"
-            BUILDKITE_AGENT_TOKEN: "prod/buildkite-agent-token"
-            SSH_PRIVATE_RSA_KEY_B64: "prod/buildkite-ssh-private-key"
-            TAILSCALE_AUTHKEY: "dev/fly-e2e-test-runner-tailscale-auth-key"
             HASURA_ADMIN_SECRET: "prod/hasura-admin-secret"
             BUILD_USER_ACCESS_KEY_ID:
               secret-id: "prod/build-user"
@@ -29,29 +25,12 @@ steps:
             BUILDEVENT_APIKEY: honeycomb-api-key
             BUILDEVENT_BUILDKITE_API_TOKEN: buildkite-api-token-honeycomb-build-events
       - replayio/buildevents#0c2adb2: ~
-      - "ssh://git@github.com/replayio/fly-buildkite-plugin.git#v0.77":
-          # This image's source code is here https://github.com/replayio/backend-e2e-base-image
-          image: "registry.fly.io/buildkite-backend-e2e-tests:v15"
-          organization: "replay"
-          cpus: 4
-          memory: 4096
-          storage: 20
-          secrets:
-            BUILDKITE_AGENT_TOKEN: BUILDKITE_AGENT_TOKEN
-            SSH_PRIVATE_RSA_KEY_B64: SSH_PRIVATE_RSA_KEY_B64
-            FLY_API_TOKEN: FLY_API_TOKEN
-            TAILSCALE_AUTHKEY: TAILSCALE_AUTHKEY
-            HASURA_ADMIN_SECRET: HASURA_ADMIN_SECRET
-            AWS_SECRET_ACCESS_KEY: BUILD_USER_SECRET_ACCESS_KEY
-            AWS_ACCESS_KEY_ID: BUILD_USER_ACCESS_KEY_ID
-            AUTOMATED_TEST_SECRET: AUTOMATED_TEST_SECRET
-            RECORD_REPLAY_API_KEY: RECORD_REPLAY_API_KEY
-            RUNTIME_TEAM_API_KEY: RUNTIME_TEAM_API_KEY
-          env:
-            DISPLAY: ":1"
-            PLAYWRIGHT_HEADLESS: "true"
-            PLAYWRIGHT_CHROMIUM: "true"
-            RECORD_REPLAY_DIRECTORY: "/mnt/data/replay"
+    env:
+      DISPLAY: ":99"
+      PLAYWRIGHT_HEADLESS: "true"
+      PLAYWRIGHT_CHROMIUM: "true"
+      RECORD_REPLAY_DIRECTORY: "/mnt/data/replay"
+      AWS_DEFAULT_REGION: "us-east-2"
 
   - label: "Runtime e2e tests (macos-arm64)"
     if: build.env("OS") == "macos" && build.env("ARCH") == "arm64"