diff --git a/config/boards/mba8mpxl-ras314.conf b/config/boards/mba8mpxl-ras314.conf
index c7fa29488676..99b9429bfcce 100644
--- a/config/boards/mba8mpxl-ras314.conf
+++ b/config/boards/mba8mpxl-ras314.conf
@@ -22,28 +22,27 @@ function post_family_tweaks_bsp__mba8mpxl-ras314() {
 	run_host_command_logged cp -Pv "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"
 
 	# Add udev rule to delay btnxpuart loading
-	cat <<- EOF > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
+	cat <<- NXP_UDEV_RULE > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules
 		# wait until combo FW is loaded by wifi driver
 		KERNEL=="mlan*", ACTION=="add", RUN+="/sbin/modprobe btnxpuart"
-	EOF
+	NXP_UDEV_RULE
 
-	if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
-		# fix X11 config
-		mkdir -p "$destination"/etc/X11/xorg.conf.d
-		cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
-			Section "Device"
-				Identifier "etnaviv"
-				Driver     "modesetting"
-				Option     "kmsdev"      "/dev/dri/card1"
-				Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
-				Option     "Atomic"      "On"
-			EndSection
+	# fix X11 config
+	mkdir -p "$destination"/etc/X11/xorg.conf.d
 
-			Section "ServerFlags"
-				Option     "AutoAddGPU"  "false"
-				Option     "DRI"         "3"
-			EndSection
-		XORG_HDMI_CONF
-	fi
+	cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
+		Section "Device"
+			Identifier "etnaviv"
+			Driver     "modesetting"
+			Option     "kmsdev"      "/dev/dri/card1"
+			Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
+			Option     "Atomic"      "On"
+		EndSection
+
+		Section "ServerFlags"
+			Option     "AutoAddGPU"  "false"
+			Option     "DRI"         "3"
+		EndSection
+	XORG_HDMI_CONF
 
 }
diff --git a/config/boards/mba8mpxl.conf b/config/boards/mba8mpxl.conf
index 64a982424c23..c946b0869b1e 100644
--- a/config/boards/mba8mpxl.conf
+++ b/config/boards/mba8mpxl.conf
@@ -14,22 +14,22 @@ ASOUND_STATE="asound.state.tqma"
 
 function post_family_tweaks_bsp__mba8mpxl() {
 
-	if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
-		# fix X11 config
-		mkdir -p "$destination"/etc/X11/xorg.conf.d
-		cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
-			Section "Device"
-				Identifier "etnaviv"
-				Driver     "modesetting"
-				Option     "kmsdev"      "/dev/dri/card1"
-				Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
-				Option     "Atomic"      "On"
-			EndSection
+	# fix X11 config
+	mkdir -p "$destination"/etc/X11/xorg.conf.d
+
+	cat <<- XORG_HDMI_CONF > "$destination"/etc/X11/xorg.conf.d/10-hdmi.conf
+		Section "Device"
+			Identifier "etnaviv"
+			Driver     "modesetting"
+			Option     "kmsdev"      "/dev/dri/card1"
+			Option     "AccelMethod" "none" ### "glamor" to enable 3D acceleration, "none" to disable.
+			Option     "Atomic"      "On"
+		EndSection
+
+		Section "ServerFlags"
+			Option     "AutoAddGPU"  "false"
+			Option     "DRI"         "3"
+		EndSection
+	XORG_HDMI_CONF
 
-			Section "ServerFlags"
-				Option     "AutoAddGPU"  "false"
-				Option     "DRI"         "3"
-			EndSection
-		XORG_HDMI_CONF
-	fi
 }