diff --git a/package.json b/package.json
index f02f628beb20..054700bdd5da 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   ],
   "scripts": {
     "build": "lerna run build",
-    "build:clean": "yarn clean:prisma && rimraf \"packages/**/dist\" --glob",
+    "build:clean": "yarn node ./tasks/clean.mjs",
     "build:clean:super": "git clean -fdx && yarn && yarn build",
     "build:link": "node ./tasks/build-and-copy",
     "build:test-project": "node ./tasks/test-project/test-project",
diff --git a/tasks/clean.mjs b/tasks/clean.mjs
new file mode 100644
index 000000000000..9264c3e0651e
--- /dev/null
+++ b/tasks/clean.mjs
@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+/* eslint-env node */
+
+import { rimraf } from 'rimraf'
+import { $ } from 'zx'
+
+await $`yarn clean:prisma`
+
+await rimraf('packages/**/dist', {
+  glob: {
+    ignore: 'packages/**/{fixtures,__fixtures__}/**/dist',
+  },
+})
diff --git a/tasks/server-tests/jest.config.js b/tasks/server-tests/jest.config.js
index 47af9941e6f7..6d446413e90f 100644
--- a/tasks/server-tests/jest.config.js
+++ b/tasks/server-tests/jest.config.js
@@ -1,6 +1,7 @@
 /** @type {import('jest').Config} */
 const config = {
   rootDir: '.',
+  testTimeout: 5_000 * 2,
 }
 
 module.exports = config
diff --git a/tasks/server-tests/server.test.ts b/tasks/server-tests/server.test.ts
index 4c8dce38598f..a7e34f9af9e5 100644
--- a/tasks/server-tests/server.test.ts
+++ b/tasks/server-tests/server.test.ts
@@ -34,7 +34,7 @@ afterEach(async () => {
   }
 })
 
-const TIMEOUT = 1_500
+const TIMEOUT = 1_000 * 2
 
 const commandStrings = {
   '@redwoodjs/cli': `node ${path.resolve(