diff --git a/configs/bdebstrap_configs/bookworm/bookworm-am62pxx-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-am62pxx-evm.yaml
index 3c3e84f..e5ebbf3 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-am62pxx-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-am62pxx-evm.yaml
@@ -105,6 +105,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
diff --git a/configs/bdebstrap_configs/bookworm/bookworm-am62xx-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-am62xx-evm.yaml
index 77b0d52..608f410 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-am62xx-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-am62xx-evm.yaml
@@ -105,6 +105,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
diff --git a/configs/bdebstrap_configs/bookworm/bookworm-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-am62xx-lp-evm.yaml
index 77b0d52..608f410 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-am62xx-lp-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-am62xx-lp-evm.yaml
@@ -105,6 +105,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
diff --git a/configs/bdebstrap_configs/bookworm/bookworm-am62xxsip-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-am62xxsip-evm.yaml
index 1e37da2..aa1c7e8 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-am62xxsip-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-am62xxsip-evm.yaml
@@ -105,6 +105,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
diff --git a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62pxx-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62pxx-evm.yaml
index 4fa647c..d73dbb3 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62pxx-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62pxx-evm.yaml
@@ -105,6 +105,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
diff --git a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-evm.yaml
index 33645c3..48f3c5e 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-evm.yaml
@@ -105,6 +105,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
diff --git a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-lp-evm.yaml
index 15cf345..095eb0a 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-lp-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xx-lp-evm.yaml
@@ -105,6 +105,8 @@ mmdebstrap:
     - 'upload target/weston/weston /etc/default/weston'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
       # Enable ssh to root user without password
     - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
     - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
diff --git a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xxsip-evm.yaml b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xxsip-evm.yaml
index 2bf7374..f0ab337 100644
--- a/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xxsip-evm.yaml
+++ b/configs/bdebstrap_configs/bookworm/bookworm-rt-am62xxsip-evm.yaml
@@ -103,6 +103,8 @@ mmdebstrap:
     - 'upload target/weston/weston.socket /etc/systemd/system/weston.socket'
     - 'chroot "$1" mkdir -p /etc/default/'
     - 'upload target/weston/weston /etc/default/weston'
+    - 'chroot "$1" mkdir -p /etc/xdg/weston/'
+    - 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
     - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
     - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
       # Enable ssh to root user without password
diff --git a/target/etc/xdg/weston/weston.ini b/target/etc/xdg/weston/weston.ini
new file mode 100644
index 0000000..d718e13
--- /dev/null
+++ b/target/etc/xdg/weston/weston.ini
@@ -0,0 +1,2 @@
+[core]
+idle-time=0
diff --git a/target/weston/weston.service b/target/weston/weston.service
index dff51a3..c2aef5e 100644
--- a/target/weston/weston.service
+++ b/target/weston/weston.service
@@ -34,7 +34,7 @@ ConditionPathExists=/dev/tty0
 # Requires systemd-notify.so Weston plugin.
 Type=simple
 EnvironmentFile=/etc/default/weston
-ExecStart=/usr/bin/weston --backend=drm-backend.so --continue-without-input --idle-time=0
+ExecStart=/usr/bin/weston --backend=drm-backend.so --continue-without-input
 
 # Optional watchdog setup
 #TimeoutStartSec=60