diff --git a/docker-compose.yml b/docker-compose.yml
index 1933d19f..79dc437c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,9 +13,6 @@ networks:
       config:
         - subnet: 10.10.10.0/24
 
-volumes:
-  webapp:
-
 services:
   sia:
     build:
@@ -76,7 +73,6 @@ services:
       - ./docker/data/nginx/logs:/usr/local/openresty/nginx/logs
       - ./docker/data/nginx/skynet:/data/nginx/skynet:ro
       - ./docker/data/sia/apipassword:/data/sia/apipassword:ro
-      - webapp:/var/www/webportal:ro
     networks:
       shared:
         ipv4_address: 10.10.10.30
@@ -86,17 +82,7 @@ services:
       - sia
       - health-check
       - handshake-api
-
-  webapp:
-    build:
-      context: ./packages/webapp
-      dockerfile: Dockerfile
-    container_name: webapp
-    restart: unless-stopped
-    logging: *default-logging
-    tty: true
-    volumes:
-      - webapp:/usr/app/public
+      - website
 
   website:
     build:
@@ -111,9 +97,9 @@ services:
       - ./docker/data/website/.cache:/usr/app/.cache
     networks:
       shared:
-        ipv4_address: 10.10.10.100
+        ipv4_address: 10.10.10.35
     expose:
-      - 3000
+      - 9000
 
   handshake:
     build:
diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf
index ca3fc9ce..4cd36189 100644
--- a/docker/nginx/conf.d/client.conf
+++ b/docker/nginx/conf.d/client.conf
@@ -77,7 +77,7 @@ server {
 
 		include /etc/nginx/conf.d/include/cors;
 
-		root /var/www/webportal;
+		proxy_pass http://website:9000;
 	}
 
 	location /docs {
diff --git a/packages/website/Dockerfile b/packages/website/Dockerfile
index 8bb60cdc..8a588a80 100644
--- a/packages/website/Dockerfile
+++ b/packages/website/Dockerfile
@@ -7,9 +7,11 @@ WORKDIR /usr/app
 COPY package.json .
 
 ENV GATSBY_TELEMETRY_DISABLED 1
-RUN yarn --no-lockfile --production
+RUN npm i --force
 
+COPY data ./data
 COPY src ./src
+COPY static ./static
 COPY gatsby-browser.js .
 COPY gatsby-config.js .
 COPY gatsby-node.js .
@@ -17,4 +19,8 @@ COPY gatsby-ssr.js .
 COPY postcss.config.js .
 COPY tailwind.config.js .
 
-CMD ["sh", "-c", "yarn build && yarn serve"]
+RUN npm run build
+
+EXPOSE 9000
+
+CMD ["sh", "-c", "npm start"]