diff --git a/zzz_draft_birdnet-pi/Dockerfile b/zzz_draft_birdnet-pi/Dockerfile
index 3ceaf5b0e..d24fab2c0 100644
--- a/zzz_draft_birdnet-pi/Dockerfile
+++ b/zzz_draft_birdnet-pi/Dockerfile
@@ -18,8 +18,10 @@ ARG BUILD_VERSION
 ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV HOME="/home/birdnet"
+ENV DEBIAN_FRONTEND noninteractive \
+    BIRDNET_USER="birdnet" \
+    HOME="/home/$BIRDNET_USER"
+
 # hadolint ignore=DL3015
 RUN \
     # Install dependencies