diff --git a/Dockerfile b/Dockerfile
index fc57b2b2..75bf0e3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,10 @@ ARG LIBRENMS_VERSION="26.3.1"
 ARG ALPINE_VERSION="3.22"
 ARG SYSLOGNG_VERSION="4.8.3-r1"
 
-FROM crazymax/yasu:latest AS yasu
+FROM tianon/gosu:latest AS gosu
+
 FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3
-COPY --from=yasu / /
+COPY --from=gosu /gosu /usr/local/bin/
 RUN apk --update --no-cache add \
     busybox-extras \
     acl \
diff --git a/rootfs/usr/bin/lnms b/rootfs/usr/bin/lnms
index 3176e66f..125ed55b 100755
--- a/rootfs/usr/bin/lnms
+++ b/rootfs/usr/bin/lnms
@@ -3,5 +3,5 @@
 if [ "$(id -u -n)" = "librenms" -a "$(id -g -n)" = "librenms" ]; then
   php -f /opt/librenms/lnms "$@"
 else
-  yasu librenms:librenms php -f /opt/librenms/lnms "$@"
+  gosu librenms:librenms php -f /opt/librenms/lnms "$@"
 fi
diff --git a/rootfs/usr/local/bin/artisan b/rootfs/usr/local/bin/artisan
index ef1720d3..59849ec6 100755
--- a/rootfs/usr/local/bin/artisan
+++ b/rootfs/usr/local/bin/artisan
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
 cd /opt/librenms || exit 1
-yasu librenms:librenms php artisan "$@"
+gosu librenms:librenms php artisan "$@"