diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
index a547d5660..3a0c2b6ad 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2023, Digi International Inc.
+# Copyright (C) 2019-2024, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
@@ -6,15 +6,6 @@ SRC_URI += " \
     file://digi_background.png \
     file://profile \
 "
-SRC_URI:append:ccimx93 = " file://weston-socket.sh"
-
-INI_UNCOMMENT_ASSIGNMENTS:append:mx9-nxp-bsp = " \
-    repaint-window=16 \
-"
-INI_UNCOMMENT_ASSIGNMENTS:append:mx93-nxp-bsp = " \
-    gbm-format=argb8888 \
-    use-g2d=true \
-"
 
 update_file() {
     if ! grep -q "$1" $3; then
@@ -24,12 +15,17 @@ update_file() {
 }
 
 do_install:append() {
-    # Add weston.log back, used by NXP for testing
-    update_file "ExecStart=/usr/bin/weston " "ExecStart=/usr/bin/weston --log=\$\{XDG_RUNTIME_DIR\}/weston.log " ${D}${systemd_system_unitdir}/weston.service
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        # Add weston.log back, used by NXP for testing
+        update_file "ExecStart=/usr/bin/weston " "ExecStart=/usr/bin/weston --log=\$\{XDG_RUNTIME_DIR\}/weston.log " ${D}${systemd_system_unitdir}/weston.service
 
-    # FIXME: weston should be run as weston, not as root
-    update_file "User=weston" "User=root" ${D}${systemd_system_unitdir}/weston.service
-    update_file "Group=weston" "Group=root" ${D}${systemd_system_unitdir}/weston.service
+        # FIXME: weston should be run as weston, not as root
+        update_file "User=weston" "User=root" ${D}${systemd_system_unitdir}/weston.service
+        update_file "Group=weston" "Group=root" ${D}${systemd_system_unitdir}/weston.service
+    else
+        # Install weston-socket.sh for sysvinit as well
+        install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh
+    fi
 }
 
 # DEY customizations
@@ -41,10 +37,6 @@ do_install:append() {
 }
 
 do_install:append:ccimx93() {
-    # The ccimx93 uses a new version of weston where 'weston-socket.sh' supercedes 'weston.sh'
-    \rm -f ${D}${sysconfdir}/profile.d/weston.sh
-    install -Dm0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh
-
     install -d ${D}${sysconfdir}/default/
     echo "QMLSCENE_DEVICE=softwarecontext" >> ${D}${sysconfdir}/default/weston
 }
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/ccimx93/weston-socket.sh b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/ccimx93/weston-socket.sh
deleted file mode 100755
index 86389d63a..000000000
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/ccimx93/weston-socket.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# set weston variables for use with global weston socket
-global_socket="/run/wayland-0"
-if [ -e "$global_socket" ]; then
-	weston_group=$(stat -c "%G" "$global_socket")
-	if [ "$(id -u)" = "0" ]; then
-		export WAYLAND_DISPLAY="$global_socket"
-	else
-		case "$(groups "$USER")" in
-			*"$weston_group"*)
-				export WAYLAND_DISPLAY="$global_socket"
-				;;
-			*)
-				;;
-		esac
-	fi
-	unset weston_group
-fi
-unset global_socket
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/ccimx93/weston.ini b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/ccimx93/weston.ini
deleted file mode 100644
index 164ee4f86..000000000
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/ccimx93/weston.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-[core]
-#gbm-format=argb8888
-idle-time=0
-#use-g2d=true
-#xwayland=true
-#repaint-window=16
-#enable-overlay-view=1
-
-#[shell]
-#size=1920x1080
-
-[libinput]
-touchscreen_calibrator=true
-
-#[output]
-#name=HDMI-A-1
-#mode=1920x1080@60
-#transform=rotate-90
-
-#[output]
-#name=HDMI-A-2
-#mode=off
-#	WIDTHxHEIGHT    Resolution size width and height in pixels
-#	off             Disables the output
-#	preferred       Uses the preferred mode
-#	current         Uses the current crt controller mode
-#transform=rotate-90
-
-[screen-share]
-command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize
-#start-on-startup=true
-
-# Digi: Set custom background
-[shell]
-background-image=/usr/share/weston/digi_background.png
-background-type=scale-crop
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
index 62d46f5d1..53c84697e 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
@@ -1,9 +1,4 @@
 [core]
-#gbm-format=argb8888
-idle-time=0
-#use-g2d=1
-#xwayland=true
-#repaint-window=16
 #enable-overlay-view=1
 modules=screen-share.so
 
@@ -29,6 +24,7 @@ touchscreen_calibrator=true
 
 [screen-share]
 command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize --rdp-tls-cert=/etc/freerdp/keys/server.crt --rdp-tls-key=/etc/freerdp/keys/server.key
+#start-on-startup=true
 
 # Digi: Set custom background
 [shell]