diff --git a/src/template.ts b/src/template.ts
index b93b384..217c830 100644
--- a/src/template.ts
+++ b/src/template.ts
@@ -68,7 +68,8 @@ export function packageJsonContent({
 
 	const serverInitScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node scripts/initServer.js" : "cross-env OAK_PLATFORM=server node scripts/initServer.js";
 	const serverStartScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node scripts/startServer.js" : "cross-env OAK_PLATFORM=server node scripts/startServer.js";
-	return `{
+	const serverStartWatchScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node --stack-size=65500 scripts/watchServer.js" : "cross-env OAK_PLATFORM=server node --stack-size=65500 scripts/watchServer.js";
+  return `{
     "name": "${name}",
     "version": "${version}",
     "description": "${description}",
@@ -87,8 +88,7 @@ export function packageJsonContent({
         "build-analyze:mp:staging": "${cliBinName} build --target mp --mode staging --analyze",
         "build:mp": "${cliBinName} build --target mp --mode production",
         "build-analyze:mp": "${cliBinName} build --target mp --mode production --analyze",
-        "build:watch": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run watch:server",
-        "watch:server": "node --stack-size=65500 scripts/watchServer.js",
+        "build:watch": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run server:start:watch",
         "start:web": "${cliBinName} start --target web --mode development  --devMode frontend",
         "start:web:server": "${cliBinName} start --target web --mode development",
         "start:native": "${cliBinName} start --target rn --mode development  --devMode frontend",
@@ -106,6 +106,7 @@ export function packageJsonContent({
         "run:android": "oak-cli run -p android",
         "server:init": "${serverInitScript}",
         "server:start": "${serverStartScript}",
+        "server:start:watch": "${serverStartWatchScript}",
         "postinstall": "npm run make:dep"
     },
     "keywords": [],