diff --git a/.drone.yml b/.drone.yml
index c84cd569..9848b88a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -38,13 +38,13 @@ steps:
       branch:
         - develop
     environment:
-      REACT_APP_API_HOST: https://pig.staging.vault48.org/
-      REACT_APP_REMOTE_CURRENT: https://pig.staging.vault48.org/static/
+      NEXT_PUBLIC_API_HOST: https://pig.staging.vault48.org/
+      NEXT_PUBLIC_REMOTE_CURRENT: https://pig.staging.vault48.org/static/
     settings:
-      dockerfile: docker/www/Dockerfile
+      dockerfile: docker/nextjs/Dockerfile
       build_args_from_env:
-        - REACT_APP_API_HOST
-        - REACT_APP_REMOTE_CURRENT
+        - NEXT_PUBLIC_API_HOST
+        - NEXT_PUBLIC_REMOTE_CURRENT
       tag:
         - ${DRONE_BRANCH}
       custom_labels:
diff --git a/docker/nextjs/Dockerfile b/docker/nextjs/Dockerfile
new file mode 100644
index 00000000..fe4a56be
--- /dev/null
+++ b/docker/nextjs/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:14-alpine as builder
+COPY package.json yarn.lock ./
+RUN yarn
+COPY . .
+ARG NEXT_PUBLIC_API_HOST
+ARG NEXT_PUBLIC_REMOTE_CURRENT
+ENV NEXT_PUBLIC_API_HOST $NEXT_PUBLIC_API_HOST
+ENV NEXT_PUBLIC_REMOTE_CURRENT $NEXT_PUBLIC_REMOTE_CURRENT
+RUN yarn next:build
+
+ENTRYPOINT ["yarn", "nginx:start"]
diff --git a/package.json b/package.json
index 4a424f81..760cb678 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,9 @@
     "build": "craco build",
     "ts-check": "tsc -p tsconfig.json --noEmit",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "next:build": "next build",
+    "next:start": "next start -p 80"
   },
   "eslintConfig": {
     "extends": [