diff --git a/apps/web-evals/src/actions/runs.ts b/apps/web-evals/src/actions/runs.ts
index be4664d4d3..2eae1f6804 100644
--- a/apps/web-evals/src/actions/runs.ts
+++ b/apps/web-evals/src/actions/runs.ts
@@ -56,7 +56,7 @@ export async function createRun({ suite, exercises = [], systemPrompt, timeout,
 
 		const dockerArgs = [
 			`--name evals-controller-${run.id}`,
-			// "--rm",
+			"--rm",
 			"--network evals_default",
 			"-v /var/run/docker.sock:/var/run/docker.sock",
 			"-v /tmp/evals:/var/log/evals",
diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts
index 30521f2c68..94bbe7f48f 100644
--- a/packages/types/src/global-settings.ts
+++ b/packages/types/src/global-settings.ts
@@ -222,7 +222,7 @@ export const EVALS_SETTINGS: RooCodeSettings = {
 	alwaysAllowUpdateTodoList: true,
 	followupAutoApproveTimeoutMs: 0,
 	allowedCommands: ["*"],
-	commandExecutionTimeout: 30_000,
+	commandExecutionTimeout: 30,
 	commandTimeoutAllowlist: [],
 	preventCompletionWithOpenTodos: false,