diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh
index 14dd6d2..a749ca2 100755
--- a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh
@@ -21,5 +21,5 @@ else
 	groupmod -o -g "$PGID" npmuser || exit 1
 	# Home for npmuser
 	mkdir -p /tmp/npmuserhome
-	chown -R npmuser:npmuser /tmp/npmuserhome
+	chown -R "$PUID:$PGID" /tmp/npmuserhome
 fi
diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh
index bcd64d2..bc27eb1 100755
--- a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh
@@ -29,7 +29,7 @@ process_folder () {
 	done
 
 	# ensure the files are still owned by the npmuser
-	chown -R npmuser:npmuser "$1"
+	chown -R "$PUID:$PGID" "$1"
 }
 
 process_folder /etc/nginx/conf.d