diff --git a/Dockerfile b/Dockerfile
index 1616b83..8b06e96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,9 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # title
-ENV TITLE=FreeCAD
+ENV TITLE=FreeCAD \
+    NO_GAMEPAD=true \
+    PIXELFLUX_WAYLAND=true
 
 RUN \
   echo "**** add icon ****" && \
diff --git a/README.md b/README.md
index ed92940..1ab4c65 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
 
+* **29.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **28.12.25:** - Add Wayland init logic.
 * **22.09.25:** - Rebase to Debian Trixie.
 * **02.07.25:** - Rebase to Selkies, HTTPS is now required! Ingest from current appimage.
diff --git a/readme-vars.yml b/readme-vars.yml
index c9bcaa6..c0250f7 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -110,6 +110,7 @@ init_diagram: |
   "freecad:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "29.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: "02.07.25:", desc: "Rebase to Selkies, HTTPS is now required! Ingest from current appimage."}
diff --git a/root/defaults/autostart b/root/defaults/autostart
index 56c8254..e0188f6 100644
--- a/root/defaults/autostart
+++ b/root/defaults/autostart
@@ -1 +1 @@
-xterm -e /opt/freecad/AppRun
+/opt/freecad/AppRun
diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland
index 4eecc27..e0188f6 100644
--- a/root/defaults/autostart_wayland
+++ b/root/defaults/autostart_wayland
@@ -1 +1 @@
-foot -e /opt/freecad/AppRun
+/opt/freecad/AppRun
diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml
index a4e7d03..64c84fe 100644
--- a/root/defaults/menu.xml
+++ b/root/defaults/menu.xml
@@ -2,6 +2,6 @@
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 <menu id="root-menu" label="MENU">
 <item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
-<item label="FreeCAD" icon="/opt/freecad/usr/share/icons/hicolor/64x64/apps/org.freecad.FreeCAD.png"><action name="Execute"><command>xterm -e /opt/freecad/AppRun</command></action></item>
+<item label="FreeCAD" icon="/opt/freecad/usr/share/icons/hicolor/64x64/apps/org.freecad.FreeCAD.png"><action name="Execute"><command>/opt/freecad/AppRun</command></action></item>
 </menu>
 </openbox_menu>
diff --git a/root/defaults/menu_wayland.xml b/root/defaults/menu_wayland.xml
index 5c6d523..e905a99 100644
--- a/root/defaults/menu_wayland.xml
+++ b/root/defaults/menu_wayland.xml
@@ -2,6 +2,6 @@
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 <menu id="root-menu" label="MENU">
 <item label="foot" icon="/usr/share/icons/hicolor/48x48/apps/foot.png"><action name="Execute"><command>/usr/bin/foot</command></action></item>
-<item label="FreeCAD" icon="/opt/freecad/usr/share/icons/hicolor/64x64/apps/org.freecad.FreeCAD.png"><action name="Execute"><command>foot -e /opt/freecad/AppRun</command></action></item>
+<item label="FreeCAD" icon="/opt/freecad/usr/share/icons/hicolor/64x64/apps/org.freecad.FreeCAD.png"><action name="Execute"><command>/opt/freecad/AppRun</command></action></item>
 </menu>
 </openbox_menu>