diff --git a/layers/meta-nwl-distro/conf/distro/nwl.conf b/layers/meta-nwl-distro/conf/distro/nwl.conf
index db3cf0f..08193fa 100644
--- a/layers/meta-nwl-distro/conf/distro/nwl.conf
+++ b/layers/meta-nwl-distro/conf/distro/nwl.conf
@@ -29,6 +29,9 @@ PACKAGECONFIG:pn-systemd = "usrmerge rfkill kmod timedated vconsole"
 # systemd-conf provides a packageconfig for a default dhcp client that we don't need
 PACKAGECONFIG:pn-systemd-conf = ""
 PACKAGECONFIG:pn-networkmanager = "systemd nss gnutls wifi bluez5 nmcli"
+# NetworkManager is starting dnsmasq when it needs it for AP mode
+SYSTEMD_AUTO_ENABLE:pn-dnsmasq = "disable"
+
 PACKAGECONFIG:pn-bluez5 = "systemd udev"
 
 # Wit busybox "less" the output of "nmcli c" does not show up properly
diff --git a/layers/meta-nwl-distro/recipes-core/packagegroups/packagegroup-nwl-core.bb b/layers/meta-nwl-distro/recipes-core/packagegroups/packagegroup-nwl-core.bb
index 4c74301..9ec07af 100644
--- a/layers/meta-nwl-distro/recipes-core/packagegroups/packagegroup-nwl-core.bb
+++ b/layers/meta-nwl-distro/recipes-core/packagegroups/packagegroup-nwl-core.bb
@@ -1,5 +1,7 @@
 inherit packagegroup
 
+DESCRIPTION = "Base packages required for the NWL Distro"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 
@@ -21,6 +23,7 @@ RDEPENDS:${PN} = " \
 	coreutils \
 	ncurses-terminfo-base \
 	networkmanager-nmcli \
+	dnsmasq \
 	systemd-conf \
 	\
 	kernel-modules \