diff --git a/Dockerfile b/Dockerfile
index 719e7814c..032dc9823 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ COPY vite.config.js ./
 COPY tsconfig.json ./
 
 # Expose the frontend port
-EXPOSE 5173
+EXPOSE ${FRONTEND_PORT:-5173}
 
 # Start the frontend using the client script
 CMD ["npm", "run", "client", "--", "--host"]
\ No newline at end of file
diff --git a/server/Dockerfile b/server/Dockerfile
index ae26e8ebc..f8853fb2b 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright:v1.40.0-jammy
+FROM node:22-slim
 
 # Set working directory
 WORKDIR /app
@@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y \
 # RUN chmod +x ./start.sh
 
 # Expose the backend port
-EXPOSE 8080
+EXPOSE ${BACKEND_PORT:-8080}
 
 # Start the backend using the start script
 CMD ["npm", "run", "server"]
\ No newline at end of file