diff --git a/ci/ci-debian.Dockerfile b/ci/ci-debian.Dockerfile
index ca9134da4..15402ae8d 100644
--- a/ci/ci-debian.Dockerfile
+++ b/ci/ci-debian.Dockerfile
@@ -41,27 +41,24 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 
 # Base Target for setting up the default user. user can be selected with the docker '--user YYY' option
 FROM base as user
-ARG USER=pi
-ARG USER_GROUP=$USER
+ARG USER_NAME=pi
+ARG USER_GROUP=$USER_NAME
+ARG USER_ID=1000
 
-ENV USER=$USER USER_GROUP=$USER_GROUP
+ENV TEST_USER_GROUP=test
+RUN groupadd --gid 1002 $TEST_USER_GROUP
 
 RUN groupadd --gid 1000 $USER_GROUP \
-  && useradd -u 1000 -g $USER_GROUP -G sudo -d /home/$USER -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER \
-  && echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER
-# ------
+  && useradd -u $USER_ID -g $USER_GROUP -G sudo,$TEST_USER_GROUP -d /home/$USER_NAME -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER_NAME \
+  && echo "$USER_NAME ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER_NAME
 
+ENV XDG_RUNTIME_DIR=/run/user/$USER_ID DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$USER_ID/bus
+# ------
 
-####### Test Targets #######
 
 # Target for setting up an alternativ user 'hans:wurst'. user can be selected with the docker '--user YYY' option
 FROM user as test-user
 
-ENV TEST_USER_GROUP=test
-
-RUN groupadd --gid 1002 $TEST_USER_GROUP \
-  && usermod -a -G $TEST_USER_GROUP $USER
-
 RUN export USER_ALT=hans \
   && export USER_ALT_GROUP=wurst \
   && groupadd --gid 1001 $USER_ALT_GROUP \