diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml
index a1990dbc..ed999977 100644
--- a/.github/workflows/hugo.yaml
+++ b/.github/workflows/hugo.yaml
@@ -9,8 +9,8 @@ jobs:
           # this is needed to checkout theme which normally come from separate git repository
           submodules: true
       - name: hugo
-        uses: klakegg/actions-hugo@832127b60a59f4ac9e5adda72cc8223a9b8473a0 # 1.0.0
+        uses: floryn90/actions-hugo@1.0.1
         with:
-          version: 0.95.0
-          # "ext-" for the Hugo extended edition including git (https://github.com/klakegg/docker-hugo/blob/master/README.md#hugo-extended-edition)
+          version: 0.121.2
+          # "ext-" for the Hugo extended edition including git (https://github.com/floryn90/docker-hugo/blob/master/README.md#hugo-extended-edition)
           image: ext-asciidoctor
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 11c76951..b518aeba 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/klakegg/docker-hugo/blob/master/README.md#hugo-extended-edition)
-    image: klakegg/hugo:0.95.0-ext-asciidoctor
+    # "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.2-ext-asciidoctor
     volumes:
       - .:/src
     ports:
       - 1313:1313
-    command: "serve --cleanDestinationDir --disableFastRender --printPathWarnings --printMemoryUsage --verbose --verboseLog --noHTTPCache"
+    command: "server --cleanDestinationDir --disableFastRender --logLevel info --noBuildLock --printPathWarnings --printMemoryUsage --noHTTPCache"
diff --git a/updatecli/updatecli.d/hugo.yaml b/updatecli/updatecli.d/hugo.yaml
index 6ab8292c..17f0566f 100644
--- a/updatecli/updatecli.d/hugo.yaml
+++ b/updatecli/updatecli.d/hugo.yaml
@@ -18,7 +18,7 @@ sources:
     kind: githubrelease
     name: Get the latest hugo version
     spec:
-      owner: "klakegg"
+      owner: "floryn90"
       repository: "docker-hugo"
       token: "{{ requiredEnv .github.token }}"
       username: "{{ .github.username }}"
@@ -27,20 +27,20 @@ sources:
 
 conditions:
   checkIfDockerImageIsPublished:
-    name: "Test if the docker image 'klakegg/hugo' is available on the DockerHub registry"
+    name: "Test if the docker image 'floryn90/hugo' is available on the DockerHub registry"
     transformers:
       - addsuffix: "-ext-asciidoctor"
     sourceid: getLatestDockerHugoVersion
     kind: dockerimage
     spec:
-      image: "klakegg/hugo"
+      image: "floryn90/hugo"
       architecture: amd64
       # Tag comes from the sourceid (+ transformation)
 
 targets:
   updateDockerComposeFile:
     transformers:
-      - addprefix: "klakegg/hugo:"
+      - addprefix: "floryn90/hugo:"
       - addsuffix: "-ext-asciidoctor"
     name: "Update Hugo version in docker image name in docker-compose.yaml"
     kind: yaml