diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
index 5ac37efee..e0922e4a3 100644
--- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
+++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
@@ -1,38 +1,44 @@
 #
-# Copyright (C) 2013-2017, Digi International Inc.
+# Copyright (C) 2013-2018, Digi International Inc.
 #
 SUMMARY = "QT packagegroup for DEY image"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
-MACHINE_QT5_EXTRA_INSTALL ?= ""
-MACHINE_QT5_EXTRA_INSTALL_ccimx6 ?= "qtwebengine-examples"
+# Install Freescale QT demo applications
+QT5_APPS = ""
+QT5_APPS_imxgpu3d = "${@bb.utils.contains("MACHINE_GSTREAMER_1_0_PLUGIN", "imx-gst1.0-plugin", "imx-qtapplications", "", d)}"
 
-QT5_PKS = "qtserialport"
-QT5_PKS_append_ccimx6 = " qtdeclarative-tools"
+# Install fonts
+QT5_FONTS = "ttf-dejavu-common ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-serif "
 
-QT5_EXAMPLES = ""
-QT5_EXAMPLES_append_ccimx6 = " \
-    qt3d-examples \
-    qtbase-examples \
-    qtconnectivity-examples \
-    qtdeclarative-examples \
-    qtmultimedia-examples \
-    qtsvg-examples \
+# Install Freescale QT demo applications for X11 backend only
+MACHINE_QT5_MULTIMEDIA_APPS = ""
+QT5_RDEPENDS = ""
+QT5_RDEPENDS_common = " \
+    packagegroup-qt5-demos \
+    ${QT5_FONTS} \
+    ${QT5_APPS} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxkbcommon', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland qtwayland-plugins', '', d)}\
 "
 
-QT5_DEMOS = "qtsmarthome"
-QT5_DEMOS_append_ccimx6 = " \
-    cinematicexperience \
-    qt5-demo-extrafiles \
-    qt5everywheredemo \
+QT5_RDEPENDS_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT5_RDEPENDS_common}', \
+    'qtbase qtbase-plugins', d)}"
+
+QT5_RDEPENDS_imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT5_RDEPENDS_common}', \
+    'qtbase qtbase-examples qtbase-plugins', d)}"
+
+QT5_RDEPENDS_imxgpu3d = " \
+    ${QT5_RDEPENDS_common} \
+    gstreamer1.0-plugins-good-qt \
 "
 
+# Add packagegroup-qt5-webengine to QT5_RDEPENDS_mx6 and comment out the line below to install qtwebengine to the rootfs.
+QT5_RDEPENDS_remove = " packagegroup-qt5-webengine"
+
 RDEPENDS_${PN} += " \
     liberation-fonts \
-    ${QT5_PKS} \
-    ${QT5_DEMOS} \
-    ${QT5_EXAMPLES} \
-    ${MACHINE_QT5_EXTRA_INSTALL} \
+    ${QT5_RDEPENDS} \
 "
diff --git a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-demos.bb b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-demos.bb
new file mode 100644
index 000000000..478f7219c
--- /dev/null
+++ b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-demos.bb
@@ -0,0 +1,29 @@
+# Copyright (C) 2014 Freescale Semiconductor
+# Copyright 2017-2018 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Package group for Qt5 demos"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+RDEPENDS_${PN}_append = " \
+    qtserialport \
+    qtsmarthome \
+"
+
+# Install the following apps on SoC with GPU
+RDEPENDS_${PN}_append_imxgpu = " \
+    cinematicexperience \
+    qtbase-examples \
+    qtconnectivity-examples \
+    qtdeclarative-examples \
+    qtmultimedia-examples \
+    qtsvg-examples \
+    qt5-demo-extrafiles \
+    qt5everywheredemo \
+"
+
+RDEPENDS_${PN}_append_imxgpu3d = " \
+    qt3d-examples \
+"
diff --git a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
new file mode 100644
index 000000000..c417a96b1
--- /dev/null
+++ b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend
@@ -0,0 +1,14 @@
+
+RDEPENDS_${PN}_remove = "qtquick1-dev \
+    qtquick1-mkspecs \
+    qtquick1-plugins \
+    qtquick1-qmlplugins \
+    qttranslations-qtquick1 \
+    qtwebkit-dev \
+    qtwebkit-mkspecs \
+    qtwebkit-qmlplugins \
+"
+
+RDEPENDS_${PN}_append_imxgpu = " \
+    qtdeclarative-tools \
+"
diff --git a/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-webengine.bb b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-webengine.bb
new file mode 100644
index 000000000..70658a4fb
--- /dev/null
+++ b/meta-digi-dey/recipes-qt/packagegroups/packagegroup-qt5-webengine.bb
@@ -0,0 +1,15 @@
+# Copyright (C) 2015 Freescale Semiconductor
+# Copyright 2017 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Package group for Qt5 webengine and examples"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+RDEPENDS_${PN} += " \
+    qtwebengine \
+    qtwebengine-qmlplugins \
+    qtquickcontrols-qmlplugins \
+    qtwebengine-examples \
+"