diff --git a/conf/layer.conf b/conf/layer.conf
index dd704a5..562cac1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -15,4 +15,4 @@ LAYERVERSION_helium = "2"
 
 
 LAYERDEPENDS_helium = "core openembedded-layer networking-layer"
-LAYERSERIES_COMPAT_helium = "mickledore"
+LAYERSERIES_COMPAT_helium = "scarthgap"
diff --git a/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/recipes-connectivity/networkmanager/networkmanager_%.bbappend
index a08314e..5890d57 100644
--- a/recipes-connectivity/networkmanager/networkmanager_%.bbappend
+++ b/recipes-connectivity/networkmanager/networkmanager_%.bbappend
@@ -3,3 +3,6 @@ DEPENDS += " nss"
 
 # WiFi is machine feature, not distro one
 PACKAGECONFIG += "${@bb.utils.contains('MACHINE_FEATURES', 'wifi', ' wifi', '', d)}"
+
+# build and install nmtui
+PACKAGECONFIG += "nmtui"
diff --git a/recipes-core/packagegroups/packagegroup-system-base.bb b/recipes-core/packagegroups/packagegroup-system-base.bb
index 4aeaca5..f2906d0 100644
--- a/recipes-core/packagegroups/packagegroup-system-base.bb
+++ b/recipes-core/packagegroups/packagegroup-system-base.bb
@@ -9,7 +9,6 @@ RDEPENDS:${PN} = " \
 	initscripts \
 	netbase \
 	networkmanager \
-	networkmanager-nmtui \
 	init-ifupdown \
 	tzdata \
 	dropbear \