diff --git a/.dockerignore b/.dockerignore
index 621a4938..4efc3dc2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -15,4 +15,4 @@ build
 package
 **/.env
 
-.pnpm-store
\ No newline at end of file
+.pnpm-store/*
\ No newline at end of file
diff --git a/apps/dashboard/Dockerfile b/apps/dashboard/Dockerfile
new file mode 100644
index 00000000..af29dd08
--- /dev/null
+++ b/apps/dashboard/Dockerfile
@@ -0,0 +1,20 @@
+FROM node:18
+
+WORKDIR "/app"
+
+RUN npm install -g pnpm
+
+COPY ./package.json ./
+COPY ./pnpm-lock.yaml ./
+
+RUN pnpm install --frozen-lockfile
+
+COPY . /app/
+
+CMD [ "ls", "-la" ]
+CMD [ "cd", "apps/dashboard" ]
+CMD [ "pnpm", "build" ]
+
+EXPOSE 5000
+
+CMD [ "pnpm", "start" ]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4c29f1bf..4f6550f5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,11 +8,12 @@ version: '3.8'
 
 services:
   backend:
-    image: node:18
-    working_dir: /app/project
-    command: sh -c "cd apps/backend && rm -rf node_modules && npm i && npm start"
-    ports:
-      - '3002:3002'
+    build:
+      dockerfile: Dockerfile
+      context: ./apps/backend
+    volumes:
+      - /app/node_modules
+      - ./apps/backend:/app
     environment:
       - NODE_ENV=production
       # Supabase - Database
@@ -31,11 +32,10 @@ services:
       - SMTP_PORT=${SMTP_PORT}
 
   dashboard:
-    image: node:18
-    working_dir: /app/project
-    command: sh -c "npm install -g pnpm && rm -rf node_modules && yes | pnpm install --frozen-lockfile && cd apps/dashboard && pnpm build && pnpm start"
-    ports:
-      - '5173:5173'
+    build:
+      dockerfile: ./apps/dashboard/Dockerfile
+      context: .
+    # command: sh -c "npm install -g pnpm && rm -rf node_modules && yes | pnpm install --frozen-lockfile && cd apps/dashboard && pnpm build && pnpm start"
     environment:
       - NODE_ENV=production
       - IS_SELFHOSTED=true
diff --git a/package.json b/package.json
index 07591831..78ec490c 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,7 @@
 	"version": "0.1.1",
 	"scripts": {
 		"build": "turbo run build",
-		"dev": "turbo run dev",
-		"prepare": "turbo run prepare",
+		"dev": "turbo prepare && turbo run dev",
 		"lint": "turbo run lint",
 		"clean": "turbo clean && rm -rf node_modules",
 		"format": "prettier . --write",