diff --git a/README.adoc b/README.adoc
index f0c31275..ab975622 100644
--- a/README.adoc
+++ b/README.adoc
@@ -104,7 +104,7 @@ You can now execute the website locally:
 
 [source,bash]
 --
-docker compose up --build --force-recreate
+RUN_AS_USER=$(id -u):$(id -g) docker compose up --build --force-recreate
 --
 
 You can then access it at http://localhost:1313/.
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2b6f9038..fad75c0e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,9 +1,10 @@
 services:
   status:
     # "ext-" for the Hugo extended edition including git (https://github.com/floryn90/docker-hugo/blob/master/README.md#hugo-extended-edition)
+    user: ${RUN_AS_USER}
     image: floryn90/hugo:0.121.1-ext-asciidoctor
     volumes:
       - .:/src
     ports:
       - 1313:1313
-    command: "server --cleanDestinationDir --disableFastRender --printPathWarnings --printMemoryUsage --logLevel info --noHTTPCache"
+    command: "server --cleanDestinationDir --disableFastRender --logLevel info --noBuildLock --printPathWarnings --printMemoryUsage --noHTTPCache"