diff --git a/Dockerfile b/Dockerfile
index 9fd5288..d7c5138 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,11 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # title
-ENV TITLE=Calligra
+ENV TITLE=Calligra \
+    NO_GAMEPAD=true \
+    SELKIES_DESKTOP=true \
+    NO_FULL=true \
+    PIXELFLUX_WAYLAND=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -40,9 +44,25 @@ RUN \
   apt-get autoclean && \
   rm -rf \
     /config/.cache \
+    /tmp/* \
+    /usr/share/applications/caja-autorun-software.desktop \
+    /usr/share/applications/caja-computer.desktop \
+    /usr/share/applications/caja-file-management-properties.desktop \
+    /usr/share/applications/caja-folder-handler.desktop \
+    /usr/share/applications/caja-home.desktop \
+    /usr/share/applications/caja-home.desktop \
+    /usr/share/applications/debian-uxterm.desktop \
+    /usr/share/applications/debian-xterm.desktop \
+    /usr/share/applications/footclient.desktop \
+    /usr/share/applications/foot-server.desktop \
+    /usr/share/applications/mate-about.desktop \
+    /usr/share/applications/mate-color-select.desktop \
+    /usr/share/applications/mate-network-scheme.desktop \
+    /usr/share/applications/st.desktop \
+    /usr/share/applications/tint2conf.desktop \
+    /usr/share/applications/tint2.desktop \
     /var/lib/apt/lists/* \
-    /var/tmp/* \
-    /tmp/*
+    /var/tmp/*
 
 # add local files
 COPY /root /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 3afa0c5..50d2123 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -10,7 +10,11 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # title
-ENV TITLE=Calligra
+ENV TITLE=Calligra \
+    NO_GAMEPAD=true \
+    SELKIES_DESKTOP=true \
+    NO_FULL=true \
+    PIXELFLUX_WAYLAND=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -40,9 +44,25 @@ RUN \
   apt-get autoclean && \
   rm -rf \
     /config/.cache \
+    /tmp/* \
+    /usr/share/applications/caja-autorun-software.desktop \
+    /usr/share/applications/caja-computer.desktop \
+    /usr/share/applications/caja-file-management-properties.desktop \
+    /usr/share/applications/caja-folder-handler.desktop \
+    /usr/share/applications/caja-home.desktop \
+    /usr/share/applications/caja-home.desktop \
+    /usr/share/applications/debian-uxterm.desktop \
+    /usr/share/applications/debian-xterm.desktop \
+    /usr/share/applications/footclient.desktop \
+    /usr/share/applications/foot-server.desktop \
+    /usr/share/applications/mate-about.desktop \
+    /usr/share/applications/mate-color-select.desktop \
+    /usr/share/applications/mate-network-scheme.desktop \
+    /usr/share/applications/st.desktop \
+    /usr/share/applications/tint2conf.desktop \
+    /usr/share/applications/tint2.desktop \
     /var/lib/apt/lists/* \
-    /var/tmp/* \
-    /tmp/*
+    /var/tmp/*
 
 # add local files
 COPY /root /
diff --git a/README.md b/README.md
index e8f0b0b..5935fb0 100644
--- a/README.md
+++ b/README.md
@@ -612,6 +612,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **30.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **28.12.25:** - Add Wayland init logic.
 * **22.09.25:** - Rebase to Debian Trixie.
 * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED.
diff --git a/readme-vars.yml b/readme-vars.yml
index ec65c69..6d56395 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -107,6 +107,7 @@ init_diagram: |
   "calligra:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "30.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "28.12.25:", desc: "Add Wayland init logic."}
   - {date: "22.09.25:", desc: "Rebase to Debian Trixie."}
   - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."}
diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland
index 7874987..f24036d 100644
--- a/root/defaults/autostart_wayland
+++ b/root/defaults/autostart_wayland
@@ -1,3 +1,13 @@
 #!/bin/bash
 
-calligrawords
+if [ ! -f "${HOME}/Desktop/org.kde.calligra.words.desktop" ]; then
+  cp /usr/share/applications/org.kde.calligra.words.desktop "${HOME}/Desktop/"
+  cp /usr/share/applications/org.kde.calligra.karbon.desktop "${HOME}/Desktop/"
+  cp /usr/share/applications/org.kde.calligraplan.desktop "${HOME}/Desktop/"
+  cp /usr/share/applications/org.kde.calligraplanwork.desktop "${HOME}/Desktop/"
+  cp /usr/share/applications/org.kde.calligra.sheets.desktop "${HOME}/Desktop/"
+  cp /usr/share/applications/org.kde.calligra.stage.desktop "${HOME}/Desktop/"
+  cp /usr/share/applications/org.kde.kexi-3.2.desktop "${HOME}/Desktop/"
+fi
+
+touch "${HOME}/.config/panel-reload"