diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 68646a6..50a3c03 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -19,7 +19,7 @@ services:
       context: .
       dockerfile: docker/dev/Dockerfile.frontend
     ports:
-      - "5173:5173"
+      - "3000:3000"
     env_file:
       - ./frontend/.env
     restart: unless-stopped
diff --git a/docker/dev/Dockerfile.frontend b/docker/dev/Dockerfile.frontend
index e4ff624..b93d4f9 100644
--- a/docker/dev/Dockerfile.frontend
+++ b/docker/dev/Dockerfile.frontend
@@ -11,7 +11,9 @@ COPY ./frontend .
 # Build the app
 RUN npm run build
 
-EXPOSE 5173
+RUN npm install -g serve
 
-# Serve built app (no hot reload)
-CMD ["npm", "run", "preview", "--", "--host", "0.0.0.0"]
\ No newline at end of file
+EXPOSE 3000
+
+# Serve built app
+CMD ["serve", "-s", "dist"]
\ No newline at end of file
diff --git a/docker/dev/Dockerfile.main b/docker/dev/Dockerfile.main
index 90f74f6..5fca132 100644
--- a/docker/dev/Dockerfile.main
+++ b/docker/dev/Dockerfile.main
@@ -21,4 +21,4 @@ EXPOSE 5000
 ENTRYPOINT [ "entrypoint.sh" ]
 
 # This '$@' will be replaced by the CMD
-CMD ["npm", "run", "dev"]
\ No newline at end of file
+CMD ["npm", "start"]
\ No newline at end of file