diff --git a/Dockerfile b/Dockerfile
index 20c5d74..59908e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,11 +100,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   && mkdir /var/log/supervisord /var/run/supervisord
 COPY supervisord.conf /etc/supervisord.conf
 
-COPY --chmod=755 ./hooks/gx.post-installation.www.sh /app/gx.post-installation.www.sh
-COPY --chmod=755 ./hooks/gx.post-installation.root.sh /docker-entrypoint-hooks.d/post-installation/gx.post-installation.root.sh
+# COPY --chmod=755 ./hooks/gx.post-installation.www.sh /app/gx.post-installation.www.sh
+# COPY --chmod=755 ./hooks/gx.post-installation.root.sh /docker-entrypoint-hooks.d/post-installation/gx.post-installation.root.sh
 
-COPY --chmod=755 ./hooks/gx.before-starting.www.sh /app/gx.before-starting.www.sh
-COPY --chmod=755 ./hooks/gx.before-starting.root.sh /docker-entrypoint-hooks.d/before-starting/gx.before-starting.root.sh
+COPY --chmod=755 ./hooks/gx.before-starting.www.sh /docker-entrypoint-hooks.d/before-starting/gx.before-starting.www.sh
 
 ENV NEXTCLOUD_UPDATE=1
 
diff --git a/Makefile b/Makefile
index a4de9c0..350737a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 all:
 
 build:
-	docker-compose build
+	docker compose build
 
 run:
-	docker-compose up -d
+	docker compose up -d
diff --git a/hooks/gx.before-starting.root.sh b/hooks/gx.before-starting.root.sh
index fc8fc9f..4e0a64d 100755
--- a/hooks/gx.before-starting.root.sh
+++ b/hooks/gx.before-starting.root.sh
@@ -3,5 +3,5 @@
 set -u
 set -e
 
-echo "== Running post-installation hooks as root user =="
+echo "== Running before-starting hooks as $(id -un) user =="
 su -l -s /bin/sh www-data -c /app/gx.before-starting.www.sh
diff --git a/hooks/gx.before-starting.www.sh b/hooks/gx.before-starting.www.sh
index 5a856a9..a1cc0da 100755
--- a/hooks/gx.before-starting.www.sh
+++ b/hooks/gx.before-starting.www.sh
@@ -3,7 +3,7 @@
 set -u
 set -e
 
-echo "== Running post-installation hooks as www user =="
+echo "== Running before-starting hooks as $(id -un) user =="
 
 # wait for nextcloud to be initialized
 WORKDIR=/var/www/html
diff --git a/hooks/gx.post-installation.root.sh b/hooks/gx.post-installation.root.sh
index 509bc77..22d6b90 100755
--- a/hooks/gx.post-installation.root.sh
+++ b/hooks/gx.post-installation.root.sh
@@ -3,6 +3,6 @@
 set -u
 set -e
 
-echo "== Running post-installation hooks as root user =="
+echo "== Running post-installation hooks as $(id -un) user =="
 su -l -s /bin/sh www-data -c /app/gx.post-installation.www.sh
 
diff --git a/hooks/gx.post-installation.www.sh b/hooks/gx.post-installation.www.sh
index b659773..eac88a5 100755
--- a/hooks/gx.post-installation.www.sh
+++ b/hooks/gx.post-installation.www.sh
@@ -3,7 +3,7 @@
 set -u
 set -e
 
-echo "== Running post-installation hooks as www user =="
+echo "== Running post-installation hooks as $(id -un) user =="
 
 # wait for nextcloud to be initialized
 WORKDIR=/var/www/html