diff --git a/Dockerfile b/Dockerfile
index a984db6..aa1fcc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,23 +34,23 @@
 
     # Create mattermost user
 #    RUN useradd --system --create-home --uid 2000 mattermost
-#    RUN groupadd -r mattermost && useradd -r -g mattermost mattermost
+    RUN groupadd -r mattermost && useradd -r -g mattermost mattermost
 
-    WORKDIR /mattermost
+    WORKDIR /opt/mattermost
 
     # Copy prepared Mattermost tree with MostlyMatter binary inside
-    #COPY --from=fetcher --chown=mattermost:mattermost /tmp/mattermost /opt/mattermost
-    COPY --from=fetcher  /tmp/mattermost /mattermost
+    COPY --from=fetcher --chown=mattermost:mattermost /tmp/mattermost /opt/mattermost
+#    COPY --from=fetcher  /tmp/mattermost /mattermost
 
     # Adjust permissions
     #RUN chown -R mattermost:mattermost /mattermost
     #VOLUME ["/opt/mattermost/config", "/opt/mattermost/data", "/opt/mattermost/logs", "/opt/mattermost/plugins", "/opt/mattermost/client/plugins"]
     
-    #USER mattermost
+    USER mattermost
 
     HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -f http://localhost:8065/api/v4/system/ping || exit 1
 
     EXPOSE 8065
 
-    ENTRYPOINT ["/mattermost/bin/mostlymatter"]
+    ENTRYPOINT ["/opt/mattermost/bin/mostlymatter"]
     CMD ["server"]
\ No newline at end of file