diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 000000000..8955e7721
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,19 @@
+{
+	"worktree": {
+		"baseRef": "fresh",
+		"symlinkDirectories": ["node_modules"]
+	},
+	"hooks": {
+		"PostToolUse": [
+			{
+				"matcher": "EnterWorktree",
+				"hooks": [
+					{
+						"type": "command",
+						"command": "\"$CLAUDE_PROJECT_DIR/scripts/assign-worktree-port.sh\""
+					}
+				]
+			}
+		]
+	}
+}
diff --git a/.worktreeinclude b/.worktreeinclude
new file mode 100644
index 000000000..e3d34d2fb
--- /dev/null
+++ b/.worktreeinclude
@@ -0,0 +1,2 @@
+.env
+.env.local
\ No newline at end of file
diff --git a/scripts/assign-worktree-port.sh b/scripts/assign-worktree-port.sh
new file mode 100755
index 000000000..0bd544db9
--- /dev/null
+++ b/scripts/assign-worktree-port.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PAYLOAD=$(cat)
+WORKTREE_PATH=$(echo "$PAYLOAD" | jq -r '.tool_response.worktreePath // empty')
+
+if [ -z "$WORKTREE_PATH" ]; then
+	exit 0
+fi
+
+ENV_FILE="$WORKTREE_PATH/apps/dokploy/.env"
+if [ ! -f "$ENV_FILE" ]; then
+	exit 0
+fi
+
+FREE_PORT=$(node "$CLAUDE_PROJECT_DIR/scripts/find-free-port.mjs")
+
+sed -i.bak "s/^PORT=.*/PORT=$FREE_PORT/" "$ENV_FILE"
+sed -i.bak -E "s#^(BETTER_AUTH_URL=https?://[^:/]+):[0-9]+#\1:$FREE_PORT#" "$ENV_FILE"
+rm -f "$ENV_FILE.bak"
+
+echo "Worktree $WORKTREE_PATH -> dokploy dev PORT=$FREE_PORT"
diff --git a/scripts/find-free-port.mjs b/scripts/find-free-port.mjs
new file mode 100644
index 000000000..2e647f504
--- /dev/null
+++ b/scripts/find-free-port.mjs
@@ -0,0 +1,23 @@
+import { createServer } from "node:net";
+
+function isFree(port) {
+	return new Promise((resolve) => {
+		const server = createServer();
+		server.once("error", () => resolve(false));
+		server.listen(port, "0.0.0.0", () => {
+			server.close(() => resolve(true));
+		});
+	});
+}
+
+async function findFreePort(start) {
+	let port = start;
+	while (!(await isFree(port))) {
+		port++;
+	}
+	return port;
+}
+
+const start = Number.parseInt(process.argv[2] || process.env.PORT || "3000", 10);
+const port = await findFreePort(start);
+process.stdout.write(String(port));