diff --git a/.gitignore b/.gitignore
index b2274a87a9..416a5e2cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ meili_data/
 api/node_modules/
 client/node_modules/
 bower_components/
+.turbo
 
 # Floobits
 .floo
diff --git a/api/package.json b/api/package.json
index b5703917f1..6bf219504a 100644
--- a/api/package.json
+++ b/api/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "start": "echo 'please run this from the root directory'",
     "server-dev": "echo 'please run this from the root directory'",
+    "watch": "cross-env NODE_ENV=development npx nodemon server/index.js",
     "test": "cross-env NODE_ENV=test jest",
     "test:ci": "jest --ci",
     "test2": "node --inspect app/langchain/test2.js",
diff --git a/client/package.json b/client/package.json
index 4d073f4300..e7c3e05a84 100644
--- a/client/package.json
+++ b/client/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "scripts": {
     "build": "cross-env NODE_ENV=production dotenv -e ../.env -- vite build",
+    "watch": "cross-env NODE_ENV=production dotenv -e ../.env -- vite build --watch",
     "build:ci": "cross-env NODE_ENV=dev vite build --mode ci",
     "dev": "cross-env NODE_ENV=dev dotenv -e ../.env -- vite",
     "preview-prod": "cross-env NODE_ENV=dev dotenv -e ../.env -- vite preview",
diff --git a/package.json b/package.json
index e3947f079f..044cccfb52 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "backend-dev": "cross-env NODE_ENV=development npx nodemon api/server/index.js",
     "frontend": "cd client && npm run build",
     "frontend-dev": "cd client && npm run dev",
+    "turbo": "dotenv -- turbo watch --parallel",
     "e2e": "playwright test --config=e2e/playwright.config.local.ts",
     "e2e:ci": "playwright test --config=e2e/playwright.config.ts",
     "e2e:debug": "cross-env PWDEBUG=1 playwright test --config=e2e/playwright.config.local.ts",
diff --git a/turbo.json b/turbo.json
new file mode 100644
index 0000000000..280216773b
--- /dev/null
+++ b/turbo.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "pipeline": {
+    "build": {
+      "outputs": ["dist/**"]
+    },
+    "watch": {
+      "outputs": ["dist/**", "client/dist/**"]
+    },
+
+    "lint": {}
+  }
+}