diff --git a/recipes-security/images/core-image-selinux.bb b/recipes-security/images/core-image-selinux.bb
index d3acb0f..0109933 100644
--- a/recipes-security/images/core-image-selinux.bb
+++ b/recipes-security/images/core-image-selinux.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
 IMAGE_INSTALL = "\
 	${CORE_IMAGE_BASE_INSTALL} \
 	packagegroup-core-basic \
-	task-core-selinux \
+	packagegroup-core-selinux \
 "   
 
 inherit core-image
diff --git a/recipes-security/tasks/task-core-selinux.bb b/recipes-security/packagegroups/packagegroup-core-selinux.bb
similarity index 81%
rename from recipes-security/tasks/task-core-selinux.bb
rename to recipes-security/packagegroups/packagegroup-core-selinux.bb
index 05f8dfc..7cd7409 100644
--- a/recipes-security/tasks/task-core-selinux.bb
+++ b/recipes-security/packagegroups/packagegroup-core-selinux.bb
@@ -1,16 +1,16 @@
-DESCRIPTION = "SELinux task for Poky"
+DESCRIPTION = "SELinux packagegroup for Poky"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r0"
 
 PACKAGES = "\
-    task-core-selinux \
+    ${PN} \
     "
 
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 
-RDEPENDS_task-core-selinux = " \
+RDEPENDS_${PN} = " \
 	ustr \
 	libsepol \
 	libsepol-bin \