diff --git a/packages/gafl-webapp-service/Dockerfile b/packages/gafl-webapp-service/Dockerfile
index 1d8143f12..fa494d74d 100644
--- a/packages/gafl-webapp-service/Dockerfile
+++ b/packages/gafl-webapp-service/Dockerfile
@@ -8,10 +8,8 @@ WORKDIR /app
 COPY packages/gafl-webapp-service/package*.json /app/
 COPY packages/gafl-webapp-service/assets /app/assets
 COPY packages/gafl-webapp-service/build /app/build
-RUN npm install --production \
-    && npm run prepare \
-    && npm prune --production \
-    && npm cache clean --force > /dev/null 2>&1
+
+RUN npm install && npm run prepare
 
 # Bundle app source
 COPY packages/gafl-webapp-service/ /app
@@ -23,7 +21,9 @@ RUN rm -Rf /app/build /app/assets
 ####################################################################################################################################
 FROM rod_licensing/base
 WORKDIR /app
-COPY --from=builder /app/ /app/
+COPY --from=builder --chown=node:node /app/ /app/
+
+RUN npm prune --production && npm cache clean --force > /dev/null 2>&1
 
 # Default service port
 ARG PORT=3000