diff --git a/openmapkit/Dockerfile b/openmapkit/Dockerfile
index f00ba7b..8c7ef45 100644
--- a/openmapkit/Dockerfile
+++ b/openmapkit/Dockerfile
@@ -9,7 +9,7 @@ RUN \
  # Install runtime dependencies
  apk --no-cache add nodejs openjdk8-jre-base \
  # Install build dependencies
- && apk --no-cache add --virtual .deps git build-base paxctl py2-pip \
+ && apk --no-cache add --virtual .deps git build-base paxctl py2-pip yarn \
  # Fix grsec attributes to loosen memory protection restrictions
  && paxctl -cm /usr/bin/node \
  # Clone OpenMapKit
@@ -18,12 +18,12 @@ RUN \
  && git submodule update --init \
  # Install OpenMapKit dependencies
  && pip install -r requirements.txt \
- && npm install -g yarn \
  && npm install libxmljs \
  && yarn \
  # Create OS user
  && addgroup -S -g 8007 omk \
  && adduser -S -u 8007 -h /srv/openmapkit -s /bin/false -g omk -G omk omk \
+ && chown -R omk:omk /srv/openmapkit \
  # Cleanup
  && apk --no-cache del .deps \
  && rm -rf /srv/openmapkit/.git* /srv/openmapkit/api/odk/pyxform/.git* \