diff --git a/Dockerfile b/Dockerfile
index d1f7821..4a84f21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,17 @@
 FROM node:12-alpine as builder
 
-RUN apk add --no-cache libpng-dev gcc make g++ zlib-dev bash lcms2-dev autoconf automake libtool nasm
-WORKDIR /app
 COPY package.json package-lock.json ./
-RUN npm ci --only-prod
+RUN npm install
 
 COPY . ./
-ENV NEXT_PUBLIC_API_URL https://api.dev.sik.party/api
-RUN npm run build
+RUN NODE_ENV=development npm run build
 
-FROM fnichol/uhttpd AS server
-EXPOSE 3000
-COPY --from=builder /app/dist /www
-ENTRYPOINT ["/usr/sbin/run_uhttpd", "-f", "-p", "3000", "-h", "/www", "-E", "/"]
+FROM node:12-alpine as server
+WORKDIR /www
+COPY package.json package-lock.json next.config.js ./
+RUN npm ci --only=production
+COPY --from=builder  .next .next
+COPY --from=builder  public public
+
+EXPOSE 80
+ENTRYPOINT ["npm", "run", "start-prod"]
\ No newline at end of file
diff --git a/Dockerfile.prod b/Dockerfile.prod
index bb3fa6c..6cee312 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -1,15 +1,17 @@
 FROM node:12-alpine as builder
 
-RUN apk add --no-cache libpng-dev gcc make g++ zlib-dev bash lcms2-dev autoconf automake libtool nasm
-WORKDIR /app
 COPY package.json package-lock.json ./
-RUN npm ci --only-prod
+RUN npm install
 
 COPY . ./
-ENV NEXT_PUBLIC_API_URL https://sika.sik.party/api
 RUN npm run build
 
-FROM fnichol/uhttpd AS server
-EXPOSE 3000
-COPY --from=builder /app/dist /www
-ENTRYPOINT ["/usr/sbin/run_uhttpd", "-f", "-p", "3000", "-h", "/www", "-E", "/"]
+FROM node:12-alpine as server
+WORKDIR /www
+COPY package.json package-lock.json next.config.js ./
+RUN npm ci --only=production
+COPY --from=builder  .next .next
+COPY --from=builder  public public
+
+EXPOSE 80
+ENTRYPOINT ["npm", "run", "start-prod"]
diff --git a/stack-compose-dev.yml b/stack-compose-dev.yml
index 418f4e7..c1b726e 100644
--- a/stack-compose-dev.yml
+++ b/stack-compose-dev.yml
@@ -10,4 +10,4 @@ services:
       update_config:
         order: start-first
     ports:
-      - 3000:3000
+      - 3000:80
diff --git a/stack-compose.yml b/stack-compose.yml
index a569c8d..a246323 100644
--- a/stack-compose.yml
+++ b/stack-compose.yml
@@ -10,4 +10,4 @@ services:
       update_config:
         order: start-first
     ports:
-      - 3000:3000
+      - 3000:80