diff --git a/Dockerfile b/Dockerfile
index 588aab6..4404e9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,10 +70,17 @@ RUN chmod 440 /etc/sudoers && \
     echo "LANG=${LANG}" >> /etc/environment && \
     echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
     echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
-    sed -i '2i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}\npulseaudio --start\npactl load-module module-xrdp-sink.so\npactl load-module module-xrdp-source.so' /etc/xrdp/startwm.sh && \
-    chmod +x /etc/xrdp/startwm.sh && \
-    mkdir -p /etc/xdg/xfce4 && \
-    echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc
+    echo "#!/bin/sh" > /etc/xrdp/startwm.sh && \
+    echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \
+    echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \
+    echo "export LC_ALL=${LC_ALL}" >> /etc/xrdp/startwm.sh && \
+    echo "export XDG_SESSION_TYPE=x11" >> /etc/xrdp/startwm.sh && \
+    echo "setxkbmap ${COUNTRY}" >> /etc/xrdp/startwm.sh && \
+    echo "pulseaudio --start" >> /etc/xrdp/startwm.sh && \
+    echo "pactl load-module module-xrdp-sink.so" >> /etc/xrdp/startwm.sh && \
+    echo "pactl load-module module-xrdp-source.so" >> /etc/xrdp/startwm.sh && \
+    echo "exec dbus-launch --exit-with-session startlxqt" >> /etc/xrdp/startwm.sh && \
+    chmod +x /etc/xrdp/startwm.sh
 
 EXPOSE 3389
 
diff --git a/buildargs.env b/buildargs.env
index 3f2a1e5..a69d2a9 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -13,7 +13,7 @@ BUILD_TZ=Europe/Berlin
 BUILD_MAINTAINER=pi-farm
 BUILD_APP_NAME=base-image-debian-rdp-ldap
 BUILD_APP_VERSION=1.0.0
-PUSH=dockerhub
+PUSH=gitea
 
 ## ENV STAGE
 ENV_SSSD_DEBUG_LEVEL=5