diff --git a/Dockerfile b/Dockerfile
index 0f212f2..7cac8f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,17 +63,24 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
 
 RUN chmod 440 /etc/sudoers && \
     mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
-    mkdir -p /home && chmod 755 /home && \
+    mkdir -p /home && chmod 777 /home && \
     chown xrdp:xrdp /etc/xrdp/key.pem /etc/xrdp/cert.pem /etc/xrdp/rsakeys.ini && \
     chmod 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
     chmod 644 /etc/xrdp/cert.pem && \
     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 mate-session" >> /etc/xrdp/startwm.sh && \
+    chmod +x /etc/xrdp/startwm.sh
 
 EXPOSE 3389
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f89b7e1..7cac8f2 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -55,29 +55,32 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s
     dpkg-reconfigure -f noninteractive tzdata && \
     printf 'XKBMODEL="pc105"\nXKBLAYOUT="%s"\nXKBVARIANT=""\nXKBOPTIONS=""\nBACKSPACE="guess"\n' "${COUNTRY}" > /etc/default/keyboard && \
     dpkg-reconfigure -f noninteractive keyboard-configuration && \
-    rm -rf /var/lib/apt/lists/* /tmp/packages.txt 
+    rm -rf /var/lib/apt/lists/* /tmp/packages.txt
 
-# NEU: Systemweite statische Konfigurationen für LDAP/PAM/Sudo
-# 1. Entfernt die gefährliche %users Regel
-# 2. Sagt nsswitch, dass Sudoers auch im SSS (LDAP) gesucht werden sollen
-# 3. Aktiviert das automatische Erstellen von Home-Verzeichnissen (mkhomedir)
 RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
     echo "sudoers: files sss" >> /etc/nsswitch.conf && \
     echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0022" >> /etc/pam.d/common-session
 
 RUN chmod 440 /etc/sudoers && \
     mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
-    mkdir -p /home && chmod 755 /home && \
+    mkdir -p /home && chmod 777 /home && \
     chown xrdp:xrdp /etc/xrdp/key.pem /etc/xrdp/cert.pem /etc/xrdp/rsakeys.ini && \
     chmod 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \
     chmod 644 /etc/xrdp/cert.pem && \
     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 mate-session" >> /etc/xrdp/startwm.sh && \
+    chmod +x /etc/xrdp/startwm.sh
 
 EXPOSE 3389
 
diff --git a/README.md b/README.md
index 26d6352..41db8a2 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ Debian Desktop with LDAP Authentication and PulseAudio. To use behind Guacamole
 
 This repository is built and pushed automatically.
 
-<a href="https://hub.docker.com/r/pifarm/base-image-debian-rdp-ldap" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/badge/docker-hub-blue?logo=docker&logoColor=white" alt="Docker Hub"></a>
+
 
 ### 🏗️ Platform Support
 | Architecture | Status | Base Image | Build Date |
 | :--- | :--- | :--- | :--- |
-| x86_64 (amd64) | ✅ Active | debian:bookworm | 08.10.2026 23:12 |
-| aarch64 (arm64) | ✅ Active | debian:bookworm | 08.10.2026 23:12 |
+| x86_64 (amd64) | ✅ Active | debian:bookworm | 10.10.2026 00:39 |
+| aarch64 (arm64) | ✅ Active | debian:bookworm | 10.10.2026 00:39 |
 
 ---
 
@@ -26,7 +26,7 @@ This repository is built and pushed automatically.
 ```yaml
 services:
   base-image-debian-rdp-ldap:
-    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
+    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
     container_name: base-image-debian-rdp-ldap
     restart: unless-stopped
     ports:
@@ -58,7 +58,7 @@ docker compose up -d
 ## 🐳 Method 2: Standalone Container (Docker Run / CLI)
 ### 🚀 1. Pull the image manually
 ```bash
-docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
+docker pull git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
 ```
 ### 🚀 2. Run the container directly
 ```bash
@@ -73,15 +73,18 @@ docker run -d \
   -e LDAP_SUDO_GROUP=YOUR-SUDO-USERS-GROUP \
   -v ./YOUR-PERSISTENT-FOLDER:/home \
   -p 3389:3389 \
-  git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
+  git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
 
 ```
 
-*Last updated on: 08.10.2026 23:12*
+*Last updated on: 10.10.2026 00:39*
 
 ### 📜 Version History
 | Version | Date | Status |
 | :--- | :--- | :--- |
+| **bookworm-mate-de** | 10.10.2026 00:39 |  ✅ |
+| **bookworm-mate-de** | 10.10.2026 00:24 |  ✅ |
+| **bookworm-de** | 10.10.2026 00:19 |  ✅ |
 | **bookworm-de-dev** | 08.10.2026 23:12 |  ✅ |
 | **trixie-de-dev** | 08.10.2026 22:15 |  ✅ |
 | **trixie-de-dev** | 08.10.2026 20:57 |  ✅ |
diff --git a/VERSION.history b/VERSION.history
index be103c7..a76e1e3 100644
--- a/VERSION.history
+++ b/VERSION.history
@@ -1,3 +1,6 @@
+| **bookworm-mate-de** | 10.10.2026 00:39 |  ✅ |
+| **bookworm-mate-de** | 10.10.2026 00:24 |  ✅ |
+| **bookworm-de** | 10.10.2026 00:19 |  ✅ |
 | **bookworm-de-dev** | 08.10.2026 23:12 |  ✅ |
 | **trixie-de-dev** | 08.10.2026 22:15 |  ✅ |
 | **trixie-de-dev** | 08.10.2026 20:57 |  ✅ |
diff --git a/buildargs.env b/buildargs.env
index bf1a8da..0a69cec 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -4,7 +4,7 @@ BUILD_COUNTRY=de
 
 ## BUILD STAGE
 BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
-BUILD_TAG="${DEBIAN_CODENAME}-${BUILD_COUNTRY}"
+BUILD_TAG="${DEBIAN_CODENAME}-mate-${BUILD_COUNTRY}"
 BUILD_TAG_LATEST=n
 BUILD_LANG=de_DE.UTF-8
 BUILD_LANGUAGE=de_DE:de
@@ -13,10 +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
-
-## BASE PACKAGES
-BUILD_BASE_PACKAGES="xrdp sssd sssd-tools libpam-sss libnss-sss libsss-sudo ldap-utils ca-certificates dbus-x11 xfce4 xfce4-terminal sudo firefox-esr firefox-esr-l10n-${BUILD_COUNTRY} thunderbird thunderbird-l10n-${BUILD_COUNTRY} locales tzdata keyboard-configuration x11-xkb-utils pulseaudio build-essential dpkg-dev git libpulse-dev meson ninja-build pkg-config autoconf libtool thunar-archive-plugin xarchiver unzip zip p7zip-full tar gzip bzip2 dialog whiptail"
+PUSH=gitea
 
 ## ENV STAGE
 ENV_SSSD_DEBUG_LEVEL=5
diff --git a/docker-compose.yml b/docker-compose.yml
index 88d8324..023e598 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   base-image-debian-rdp-ldap:
-    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-de-dev
+    image: git.pi-farm.de/pi-farm/base-image-debian-rdp-ldap:bookworm-mate-de
     container_name: base-image-debian-rdp-ldap
     restart: unless-stopped
     ports:
diff --git a/entrypoint.sh b/entrypoint.sh
index 377433f..159bf5e 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -30,6 +30,7 @@ ldap_default_authtok = ${LDAP_BIND_PASSWORD}
 
 ldap_schema = rfc2307bis
 ldap_group_member = uniqueMember
+
 ldap_auth_disable_tls_never_use_in_production = true
 ldap_id_use_start_tls = false
 ldap_tls_reqcert = never
@@ -65,4 +66,21 @@ sssd -D --debug-level=${SSSD_DEBUG}
 
 echo ">>> Starte XRDP..."
 xrdp-sesman
-exec xrdp -n
\ No newline at end of file
+xrdp
+
+echo ">>> Leite Logs an Docker weiter..."
+mkdir -p /var/log/sssd /var/log/xrdp
+
+touch /var/log/xrdp.log \
+      /var/log/xrdp-sesman.log \
+      /var/log/sssd/sssd.log \
+      /var/log/sssd/sssd_LDAP.log \
+      /var/log/sssd/sssd_nss.log \
+      /var/log/sssd/sssd_pam.log
+
+exec tail -F /var/log/xrdp.log \
+             /var/log/xrdp-sesman.log \
+             /var/log/sssd/sssd.log \
+             /var/log/sssd/sssd_LDAP.log \
+             /var/log/sssd/sssd_nss.log \
+             /var/log/sssd/sssd_pam.log
\ No newline at end of file
diff --git a/packages.txt b/packages.txt
index cde159d..8c43b57 100644
--- a/packages.txt
+++ b/packages.txt
@@ -9,8 +9,9 @@ xrdp
 xorgxrdp
 dbus
 dbus-x11
-xfce4
-xfce4-terminal
+mate-desktop-environment
+mate-terminal
+pluma
 xdg-user-dirs
 desktop-base
 sudo