diff --git a/classes/populate_sdk_qt6.bbclass b/classes/populate_sdk_qt6.bbclass
new file mode 100644
index 0000000..14fb21c
--- /dev/null
+++ b/classes/populate_sdk_qt6.bbclass
@@ -0,0 +1,5 @@
+inherit populate_sdk_qt6_base
+
+# include all available modules
+TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt6-toolchain-host"
+TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt6-modules"
diff --git a/recipes-qt/meta/meta-toolchain-qt6.bb b/recipes-qt/meta/meta-toolchain-qt6.bb
index 50e6345..2f5e82c 100644
--- a/recipes-qt/meta/meta-toolchain-qt6.bb
+++ b/recipes-qt/meta/meta-toolchain-qt6.bb
@@ -1,9 +1,6 @@
-SUMMARY = "Meta package for building an installable Qt5 toolchain and SDK"
+SUMMARY = "Meta package for building an installable Qt6 toolchain and SDK"
 LICENSE = "MIT"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-inherit populate_sdk populate_sdk_qt6_base
-
-TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt6-toolchain-host"
-TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt6-modules"
+inherit populate_sdk populate_sdk_qt6