diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index e855becf8..3b8317fe4 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -1,9 +1,12 @@
 # Docker image for the primary terria map application server
+# Intended for use only with a "context" directory created by create-docker-context.js
 FROM node:16-slim
 
-RUN mkdir -p /usr/src/app && mkdir -p /etc/config/client
-WORKDIR /usr/src/app/component
-COPY . /usr/src/app
+RUN mkdir -p /etc/config/client
+
+USER node
+WORKDIR /usr/src/app
+COPY --chown=node:node component /usr/src/app
 
 EXPOSE 3001
 ENV NODE_ENV=production
diff --git a/deploy/helm/terria/charts/terriamap/templates/deployment.yaml b/deploy/helm/terria/charts/terriamap/templates/deployment.yaml
index 5d5bcb47d..fa6b65391 100644
--- a/deploy/helm/terria/charts/terriamap/templates/deployment.yaml
+++ b/deploy/helm/terria/charts/terriamap/templates/deployment.yaml
@@ -31,7 +31,7 @@ spec:
           - name: terriamap-config-server
             mountPath: /etc/config/server
           - name: terriamap-config-client
-            mountPath: /usr/src/app/component/wwwroot/config.json
+            mountPath: /usr/src/app/wwwroot/config.json
             subPath: config.json
       volumes:
         - name: terriamap-config-client