diff --git a/.dockerignore b/.dockerignore
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,4 +4,5 @@ .git/
 .github/
 .claude/
 .env
+.builder-override/
 docker-compose*.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -127,6 +127,7 @@ unit-tests:
     needs: changes
     if: always() && (needs.changes.outputs.server == 'true' || (github.event_name == 'workflow_dispatch' && inputs.server))
     runs-on: depot-ubuntu-24.04
+    timeout-minutes: 15
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -149,6 +150,7 @@ e2e-tests:
     needs: changes
     if: always() && (needs.changes.outputs.server == 'true' || (github.event_name == 'workflow_dispatch' && inputs.server))
     runs-on: depot-ubuntu-24.04
+    timeout-minutes: 15
     services:
       postgres:
         image: postgres:16-alpine
diff --git a/docker-compose.e2e.ci.yml b/docker-compose.e2e.ci.yml
new file mode 100644
--- /dev/null
+++ b/docker-compose.e2e.ci.yml
@@ -0,0 +1,5 @@
+services:
+  happyview:
+    build:
+      additional_contexts:
+        builder: .builder-override
diff --git a/web/playwright.config.ts b/web/playwright.config.ts
--- a/web/playwright.config.ts
+++ b/web/playwright.config.ts
@@ -28,6 +28,9 @@ name: "post-setup",
       testMatch: [
         "service-identity-settings.spec.ts",
         "lexicon-services.spec.ts",
+        "lexicon-delete.spec.ts",
+        "script-delete.spec.ts",
+        "record-delete.spec.ts",
         "proxy-config.spec.ts",
       ],
       dependencies: ["setup"],