diff --git a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend
index 658b4ba65..e1d4f63a4 100644
--- a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend
+++ b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 Digi International.
+# Copyright (C) 2015-2021 Digi International.
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
@@ -7,23 +7,39 @@ SRC_URI += " \
     file://qmlvideo.png \
 "
 
-do_install_append () {
-	# Add qmlvideo shortcut
-	install -m 0644 ${WORKDIR}/qmlvideo.desktop ${D}${datadir}/applications/
-	install -m 0644 ${WORKDIR}/qmlvideo.png ${D}${datadir}/pixmaps/
+# Install hellowindow demo as a default QT APP on all platforms
+do_install () {
+    install -d ${D}/${datadir}/pixmaps
+    install -d ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/hellowindow.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/hellowindow.desktop ${D}/${datadir}/applications
 
-	# Remove the desktop launchers that have been moved along with its package
-	rm -f ${D}${datadir}/applications/qtsmarthome.desktop ${D}${datadir}/pixmaps/qtsmarthome.png
-
-	# Remove the desktop launchers of the demo/example applications we do not provide.
-	rm -f ${D}${datadir}/applications/hellogl_es2.desktop ${D}${datadir}/pixmaps/hellogl_es2.png
-	rm -f ${D}${datadir}/applications/qt5basket.desktop ${D}${datadir}/pixmaps/qt5basket.png
-	rm -f ${D}${datadir}/applications/qt5nesting.desktop ${D}${datadir}/pixmaps/qt5nesting.png
-	rm -f ${D}${datadir}/applications/qt5nmapcarousedemo.desktop ${D}${datadir}/pixmaps/qt5nmapcarousedemo.png
-	rm -f ${D}${datadir}/applications/qt5nmapper.desktop ${D}${datadir}/pixmaps/qt5nmapper.png
-	rm -f ${D}${datadir}/applications/qt5solarsystem.desktop ${D}${datadir}/pixmaps/qt5solarsystem.png
-	rm -f ${D}${datadir}/applications/qtledbillboard.desktop ${D}${datadir}/pixmaps/qtledbillboard.png
-	rm -f ${D}${datadir}/applications/qtledcombo.desktop ${D}${datadir}/pixmaps/qtledcombo.png
-	rm -f ${D}${datadir}/applications/quitbattery.desktop ${D}${datadir}/pixmaps/quitbattery.png
-	rm -f ${D}${datadir}/applications/quitindicators.desktop ${D}${datadir}/pixmaps/quitindicators.png
+    # Add qmlvideo shortcut
+    install -m 0644 ${WORKDIR}/qmlvideo.desktop ${D}${datadir}/applications
+    install -m 0644 ${WORKDIR}/qmlvideo.png ${D}${datadir}/pixmaps
 }
+
+# Install other qt5 demos on SoC with GPU
+# Align with former release, do not install
+# hellogl_es2.desktop & qt5basket.desktop & qt5nesting.desktop & qt5solarsystem.desktop
+# as they are not supported
+
+do_install_append_imxgpu2d () {
+    install -m 0644 ${WORKDIR}/cinematicexperience.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/cinematicexperience.desktop ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/qt5everywheredemo.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/qt5everywheredemo.desktop ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/qt5nmapcarousedemo.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/qt5nmapcarousedemo.desktop ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/qt5nmapper.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/qt5nmapper.desktop ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/qtledbillboard.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/qtledbillboard.desktop ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/qtledcombo.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/qtledcombo.desktop ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/quitbattery.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/quitbattery.desktop ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/quitindicators.png ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/quitindicators.desktop ${D}/${datadir}/applications
+}
+
diff --git a/meta-digi-dey/recipes-qt/qt5/qt5-demo-extrafiles.bbappend b/meta-digi-dey/recipes-qt/qt5/qt5-demo-extrafiles.bbappend
deleted file mode 100644
index f9926e905..000000000
--- a/meta-digi-dey/recipes-qt/qt5/qt5-demo-extrafiles.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-# Install hellowindow demo as a default QT APP on all platforms
-do_install () {
-    install -d ${D}/${datadir}/pixmaps
-    install -d ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/hellowindow.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/hellowindow.desktop ${D}/${datadir}/applications
-}
-
-# Install other qt5 demos on SoC with GPU
-# Align with former release, do not install
-# hellogl_es2.desktop & qt5basket.desktop & qt5nesting.desktop & qt5solarsystem.desktop
-# as they are not supported
-
-do_install_append_imxgpu2d () {
-    install -m 0644 ${WORKDIR}/cinematicexperience.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/cinematicexperience.desktop ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/qt5everywheredemo.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/qt5everywheredemo.desktop ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/qt5nmapcarousedemo.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/qt5nmapcarousedemo.desktop ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/qt5nmapper.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/qt5nmapper.desktop ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/qtledbillboard.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/qtledbillboard.desktop ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/qtledcombo.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/qtledcombo.desktop ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/quitbattery.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/quitbattery.desktop ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/quitindicators.png ${D}/${datadir}/pixmaps
-    install -m 0644 ${WORKDIR}/quitindicators.desktop ${D}/${datadir}/applications
-}
-