diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend
index 74739dbf6..2b3e593bd 100644
--- a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend
@@ -17,7 +17,8 @@ INI_UNCOMMENT_ASSIGNMENTS_append_mx8mp = " \
 "
 
 # Digi: use g2d on ccimx6sbc to fix desktop window issue
-INI_UNCOMMENT_ASSIGNMENTS_append_ccimx6sbc = " \
+# Also needed to workaround an HDMI hotplug issue on the ccimx6qpsbc
+INI_UNCOMMENT_ASSIGNMENTS_append_ccimx6 = " \
     use-g2d=1 \
 "
 
diff --git a/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend
index ddc30ee6d..f70bfd5b1 100644
--- a/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend
@@ -1,3 +1,3 @@
 # Copyright (C) 2020 Digi International.
 
-SRC_URI_append_ccimx6sbc = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch"
+SRC_URI_append_ccimx6 = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch"