diff --git a/Dockerfile b/Dockerfile
index 00870af..560ef5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,16 +35,19 @@
     
     # Create mattermost user
 #    RUN useradd --system --create-home --uid 2000 mattermost
+    RUN groupadd -r mattermost && useradd -r -g mattermost mattermost
     
     WORKDIR /mattermost
     
     # Copy prepared Mattermost tree with MostlyMatter binary inside
-    COPY --from=fetcher /tmp/mattermost /mattermost
+    COPY --from=fetcher --chown=mattermost:mattermost /tmp/mattermost /mattermost
     
     # Adjust permissions
 #    RUN chown -R mattermost:mattermost /mattermost
     
-#    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