diff --git a/Dockerfile b/Dockerfile
index 617dee1..777fab1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,6 +35,10 @@ COPY --from=builder /usr/share/fonts /usr/share/fonts
 
 ENV FONTCONFIG_PATH /usr/share/fonts
 
+# Use morphos as user
+RUN useradd -m morphos
+USER morphos
+
 EXPOSE 8080
 
 ENTRYPOINT ["/bin/morphos"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 822299a..be70ceb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,10 @@ name: morphos
 services:
   morphos-server:
     image: ghcr.io/danvergara/morphos-server:latest
+    # uncomment this if you want to build the container yourself.
+    # build:
+    #   context: .
+    #   target: release
     ports:
       - 8080:8080
     volumes: