diff --git a/Dockerfile.backend b/Dockerfile.backend
index 3fffd154..fae0d146 100644
--- a/Dockerfile.backend
+++ b/Dockerfile.backend
@@ -8,18 +8,21 @@ COPY .sequelizerc .sequelizerc
 # Install node dependencies
 COPY package*.json ./
 COPY src ./src
-COPY public ./public 
+COPY public ./public
 COPY server ./server
 COPY tsconfig.json ./
 COPY server/tsconfig.json ./server/
-# COPY server/start.sh ./  
+# COPY server/start.sh ./
 
 # Install dependencies
 RUN npm install --legacy-peer-deps
 
+# Build TypeScript server
+RUN npm run build:server
+
 # Expose backend port
 EXPOSE ${BACKEND_PORT:-8080}
 
-# Run migrations & start backend using start script
+# Run migrations & start backend using plain node
 CMD ["npm", "run", "server"]
 # CMD ["sh", "-c", "npm run migrate && npm run server"]
\ No newline at end of file
diff --git a/package.json b/package.json
index 41b1255c..d8a6a831 100644
--- a/package.json
+++ b/package.json
@@ -83,12 +83,13 @@
     "winston": "^3.5.1"
   },
   "scripts": {
-    "start": "concurrently -k \"npm run server\" \"npm run client\"",
-    "server": "cross-env NODE_OPTIONS='--max-old-space-size=8000' nodemon server/src/server.ts",
+    "start": "concurrently -k \"npm run server:dev\" \"npm run client\"",
+    "server": "cross-env NODE_OPTIONS='--max-old-space-size=8000' node server/dist/server/src/server.js",
+    "server:dev": "cross-env NODE_OPTIONS='--max-old-space-size=8000' nodemon --exec ts-node server/src/server.ts",
     "client": "vite",
     "build": "vite build",
     "build:server": "tsc -p server/tsconfig.json",
-    "start:server": "cross-env NODE_OPTIONS='--max-old-space-size=8000' server/dist/server/src/server.js",
+    "start:server": "cross-env NODE_OPTIONS='--max-old-space-size=8000' node server/dist/server/src/server.js",
     "preview": "vite preview",
     "lint": "./node_modules/.bin/eslint .",
     "migrate": "sequelize-cli db:migrate",