diff --git a/Dockerfile b/Dockerfile
index aa1fcc8..ff48648 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,8 @@
 
     # 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
+    RUN useradd -r -u 1001 mattermost
 
     WORKDIR /opt/mattermost
 
@@ -43,10 +44,10 @@
 #    COPY --from=fetcher  /tmp/mattermost /mattermost
 
     # Adjust permissions
-    #RUN chown -R mattermost:mattermost /mattermost
+    RUN chown -R mattermost:mattermost /opt/mattermost
     #VOLUME ["/opt/mattermost/config", "/opt/mattermost/data", "/opt/mattermost/logs", "/opt/mattermost/plugins", "/opt/mattermost/client/plugins"]
     
-    USER mattermost
+    USER 1001
 
     HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -f http://localhost:8065/api/v4/system/ping || exit 1