diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 19943434e6..0182b45351 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -165,7 +165,7 @@ jobs:
             - name: Run Playwright tests
               working-directory: apps/web
               run: |
-                  pnpm playwright test \
+                  pnpm test:playwright \
                       --shard "$SHARD" \
                       --project="${{ matrix.project }}" \
                       ${{ (github.event_name == 'pull_request' && matrix.runAllTests == false ) && '--grep-invert @mergequeue' || '' }}
diff --git a/apps/web/project.json b/apps/web/project.json
index 8a434bc9aa..59fa9f3a66 100644
--- a/apps/web/project.json
+++ b/apps/web/project.json
@@ -44,7 +44,7 @@
                 "parallel": false,
                 "cwd": "apps/web"
             },
-            "dependsOn": ["^build"]
+            "dependsOn": ["^build", "^build:playwright"]
         },
         "test:unit": {
             "executor": "@nx/jest:jest",
diff --git a/knip.ts b/knip.ts
index 43ba17061b..97d3332861 100644
--- a/knip.ts
+++ b/knip.ts
@@ -5,13 +5,9 @@ process.env.GITHUB_ACTIONS = "1";
 
 export default {
     workspaces: {
-        "packages/shared-components": {
-            ignoreDependencies: [
-                // Used for vitest browser tests
-                "@playwright/test",
-            ],
-        },
+        "packages/shared-components": {},
         "packages/playwright-common": {
+            entry: ["src/stale-screenshot-reporter.ts", "src/fixtures/index.ts", "src/testcontainers/index.ts"],
             ignoreDependencies: [
                 // Used in playwright-screenshots.sh
                 "wait-on",
diff --git a/packages/playwright-common/src/testcontainers/index.ts b/packages/playwright-common/src/testcontainers/index.ts
index 42c73f4802..c7dbb4fd68 100644
--- a/packages/playwright-common/src/testcontainers/index.ts
+++ b/packages/playwright-common/src/testcontainers/index.ts
@@ -6,11 +6,13 @@ Please see LICENSE files in the repository root for full details.
 */
 
 export { PostgreSqlContainer, StartedPostgreSqlContainer } from "@testcontainers/postgresql";
+export { makePostgres } from "./postgres.js";
 export type { HomeserverInstance, HomeserverContainer, StartedHomeserverContainer } from "./HomeserverContainer.js";
 export { type SynapseConfig, SynapseContainer, StartedSynapseContainer } from "./synapse.js";
 export {
     type MasConfig,
     MatrixAuthenticationServiceContainer,
     StartedMatrixAuthenticationServiceContainer,
+    makeMas,
 } from "./mas.js";
 export { type MailpitClient, MailpitContainer, StartedMailpitContainer } from "./mailpit.js";