diff --git a/battybirdnet-pi/Dockerfile b/battybirdnet-pi/Dockerfile
index 5eb2d906e..22209c4eb 100644
--- a/battybirdnet-pi/Dockerfile
+++ b/battybirdnet-pi/Dockerfile
@@ -108,6 +108,9 @@ RUN \
     # Give access to caddy for files owned by the user, to allow files modification
     groupmod -o -g 1000 caddy && usermod -o -u 1000 caddy && \
     \
+    # Ensure always pi is used
+    for file in $(grep -srl "/etc/passwd" $HOME/BirdNET-Pi/); do sed -i "s=/etc/passwd=/etc/passwd | head -1=g" "$file"; done && \
+    \
     # Cleanup
     apt-get clean all && \
     rm -rf /var/lib/apt/lists/*