diff --git a/docker-compose.yml b/docker-compose.yml
index 9e400acd..72321d31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,3 +43,26 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
+
+  polyweather_frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    container_name: polyweather_frontend
+    restart: unless-stopped
+    ports:
+      - "3000:3000"
+    environment:
+      POLYWEATHER_API_BASE_URL: "${POLYWEATHER_API_BASE_URL:-http://polyweather_web:8000}"
+      NEXT_PUBLIC_POLYWEATHER_API_BASE_URL: "${NEXT_PUBLIC_POLYWEATHER_API_BASE_URL:-}"
+      NEXT_PUBLIC_SUPABASE_URL: "${NEXT_PUBLIC_SUPABASE_URL}"
+      NEXT_PUBLIC_SUPABASE_ANON_KEY: "${NEXT_PUBLIC_SUPABASE_ANON_KEY}"
+      NEXT_PUBLIC_SITE_URL: "${NEXT_PUBLIC_SITE_URL:-https://38.54.27.70.sslip.io}"
+      POLYWEATHER_AUTH_ENABLED: "${POLYWEATHER_AUTH_ENABLED:-true}"
+      POLYWEATHER_AUTH_REQUIRED: "${POLYWEATHER_AUTH_REQUIRED:-true}"
+      NEXT_PUBLIC_POLYWEATHER_LOCAL_FULL_ACCESS: "false"
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://localhost:3000"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 00000000..af468529
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,12 @@
+FROM node:20-alpine
+
+WORKDIR /app/frontend
+
+COPY package.json package-lock.json ./
+RUN npm ci
+
+COPY . ./
+RUN npm run build
+
+EXPOSE 3000
+CMD ["npm", "run", "start"]