diff --git a/zzz_draft_birdnet-pi/Dockerfile b/zzz_draft_birdnet-pi/Dockerfile
index f0eafcf55..9bbd30e3f 100644
--- a/zzz_draft_birdnet-pi/Dockerfile
+++ b/zzz_draft_birdnet-pi/Dockerfile
@@ -23,7 +23,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     USER="abc" \
     PUID=1000 \
     PGID=1000 \
-    HOME="/home/abc"
+    HOME="/home/abc" \
+    XDG_RUNTIME_DIR="/run/user/1000"
 
 # hadolint ignore=DL3015
 RUN \
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run
index 9bf9fc2ca..46c9eb0f1 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run
@@ -1,6 +1,5 @@
 #!/bin/execlineb -P
 with-contenv
-s6-envdir /run/user/1000
 s6-setuidgid ${USER}
 /usr/local/bin/gotty --address localhost -p 8080 --path log --title-format "BirdNET-Pi Log" birdnet_log.sh
 
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run
index 668a6c31f..352e27ce1 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run
@@ -1,5 +1,4 @@
 #!/bin/execlineb -P
 with-contenv
-s6-envdir /run/user/1000
 s6-setuidgid ${USER}
 /usr/local/bin/birdnet_recording.sh
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run
index 2377ff323..5ebb2a4dc 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run
@@ -1,4 +1,3 @@
 #!/bin/execlineb -P
 with-contenv
-s6-envdir /run/user/1000
 /usr/local/bin/livestream.sh
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run
index 71f84e212..e84deb87c 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run
@@ -1,4 +1,3 @@
 #!/bin/execlineb -P
 with-contenv
-s6-envdir /run/user/1000
 /usr/local/bin/gotty --address localhost -w -p 8888 --path terminal --title-format "BirdNET-Pi Terminal" login