diff --git a/backend/Dockerfile b/backend/Dockerfile
index 42f75b9..63cb581 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -6,24 +6,36 @@ ARG NODE_ENV
 ARG API_URL
 ARG CORS_ORIGIN
 ARG DATABASE_URL
+ARG POSTGRES_USER
+ARG POSTGRES_PASSWORD
+ARG POSTGRES_DB
 ARG JWT_SECRET
 ARG SMTP_HOST
 ARG SMTP_PORT
 ARG SMTP_USER
 ARG SMTP_PASS
 ARG EMAIL_FROM
+ARG DEFAULT_ADMIN_EMAIL
+ARG DEFAULT_ADMIN_PASSWORD
+ARG DEFAULT_ADMIN_NAME
 
 # Set environment variables from build args
 ENV NODE_ENV=${NODE_ENV}
 ENV API_URL=${API_URL}
 ENV CORS_ORIGIN=${CORS_ORIGIN}
 ENV DATABASE_URL=${DATABASE_URL}
+ENV POSTGRES_USER=${POSTGRES_USER}
+ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+ENV POSTGRES_DB=${POSTGRES_DB}
 ENV JWT_SECRET=${JWT_SECRET}
 ENV SMTP_HOST=${SMTP_HOST}
 ENV SMTP_PORT=${SMTP_PORT}
 ENV SMTP_USER=${SMTP_USER}
 ENV SMTP_PASS=${SMTP_PASS}
 ENV EMAIL_FROM=${EMAIL_FROM}
+ENV DEFAULT_ADMIN_EMAIL=${DEFAULT_ADMIN_EMAIL}
+ENV DEFAULT_ADMIN_PASSWORD=${DEFAULT_ADMIN_PASSWORD}
+ENV DEFAULT_ADMIN_NAME=${DEFAULT_ADMIN_NAME}
 
 WORKDIR /usr/src/app
 
@@ -59,4 +71,6 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD wget -q --spider http://localhost:3000/health || exit 1
 
 # Start the application
-CMD ["npm", "run", "start:prod"]
+# CMD ["npm", "run", "start:prod"]
+
+CMD ["node", "dist/main.js"]
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
index 0c8cd71..42bf4bc 100644
--- a/backend/docker-compose.yml
+++ b/backend/docker-compose.yml
@@ -20,7 +20,7 @@ services:
     ports:
       - "3000:3000"
     environment:
-      # - NODE_ENV=${NODE_ENV}
+      - NODE_ENV=${NODE_ENV}
       - API_URL=${API_URL}
       - CORS_ORIGIN=${CORS_ORIGIN}
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}