diff --git a/nodemon.json b/nodemon.json
new file mode 100644
index 00000000..da17ca20
--- /dev/null
+++ b/nodemon.json
@@ -0,0 +1,14 @@
+{
+  "verbose": false,
+  "watch": [
+    "server/src"
+  ],
+  "ext": "ts,js,json",
+  "ignore": [
+    ".git",
+    "node_modules",
+    "server/src/tmp",
+    "server/dist"
+  ],
+  "exec": "ts-node --project tsconfig.dev.json server/src/index.ts"
+}
diff --git a/package.json b/package.json
index 130b9ec2..59526d77 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "preinstall": "node scripts/setup/preinstall.js",
     "postinstall": "ts-node scripts/setup/setup.js",
     "dev:app": "vite --config app/vite.config.js",
-    "dev:server": "npm run train && npm run generate:skills-endpoints && cross-env LEON_NODE_ENV=development nodemon --watch server/src --ext ts,js,json --ignore server/src/tmp/ --exec ts-node --project tsconfig.dev.json server/src/index.ts",
+    "dev:server": "npm run train && npm run generate:skills-endpoints && cross-env LEON_NODE_ENV=development nodemon",
     "wake": "cross-env LEON_HOST=http://localhost LEON_PORT=1337 node hotword/index.js",
     "delete-dist:server": "shx rm -rf ./server/dist",
     "prepare": "husky install",
@@ -45,7 +45,7 @@
     "generate:http-api-key": "ts-node scripts/generate/run-generate-http-api-key.js",
     "build": "npm run build:app && npm run build:server",
     "build:app": "cross-env LEON_NODE_ENV=production ts-node scripts/app/run-build-app.js",
-    "build:server": "npm run delete-dist:server && npm run train && npm run generate:skills-endpoints && tsc && shx mv -f server/dist/server/src/* server/dist && shx rm -rf server/dist/core server/dist/package.json && shx mkdir -p server/dist/tmp",
+    "build:server": "npm run delete-dist:server && npm run train && npm run generate:skills-endpoints && tsc && shx mkdir -p server/dist/tmp",
     "start:tcp-server": "cross-env PIPENV_PIPFILE=bridges/python/Pipfile pipenv run python bridges/python/tcp_server/main.py",
     "start": "cross-env LEON_NODE_ENV=production node ./server/dist/index.js",
     "train": "ts-node scripts/train/run-train.js",