diff --git a/openmapkit/Dockerfile b/openmapkit/Dockerfile
index 9ef57d6..7de29c1 100644
--- a/openmapkit/Dockerfile
+++ b/openmapkit/Dockerfile
@@ -11,15 +11,17 @@ RUN \
 
 RUN \
  # Install build dependencies
- apk --no-cache add --virtual .deps build-base git npm py2-pip \
+ apk --no-cache add --virtual .deps build-base git py2-pip yarn \
  # Clone OpenMapKit
  && git clone --depth 1 https://github.com/posm/OpenMapKitServer /srv/openmapkit \
  && cd /srv/openmapkit \
  && git submodule update --init \
  # Install OpenMapKit dependencies
  && pip install -r requirements.txt \
- && npm install libxmljs \
- && npm install \
+ && yarn \
+ && cd frontend \
+ && yarn \
+ && yarn build \
  # Create OS user
  && addgroup -S -g 8007 omk \
  && adduser -S -u 8007 -h /srv/openmapkit -s /bin/false -g omk -G omk omk \
diff --git a/openmapkit/srv/openmapkit/conf/settings.js b/openmapkit/srv/openmapkit/conf/settings.js
index e9bbea9..56b9083 100644
--- a/openmapkit/srv/openmapkit/conf/settings.js
+++ b/openmapkit/srv/openmapkit/conf/settings.js
@@ -3,7 +3,7 @@ module.exports = {
     description: 'OpenMapKit Server is the lightweight server component of OpenMapKit that handles the collection and aggregation of OpenStreetMap and OpenDataKit data.',
     port: 8080,
     dataDir: __dirname + '/data',
-    pagesDir: __dirname + '/pages',
+    pagesDir: __dirname + '/frontend/build',
     hostUrl: 'http://posm.io',
     osmApi: {
         server: 'http://osm.posm.io',