diff --git a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
index fd63e2497f38a3a7bf6c49aef90b23190c073c3f..7d07fcde6b634caee222ae3e09a30c37666899a0 100644
--- a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
+++ b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
@@ -31,3 +31,11 @@ ST_USERFS = "0"
 # mask out the blueprint layers in the main distro and unmask
 # them only the blueprint distributions.
 BBMASK = ""
+
+# If dnsmaq runs as system service started by systemd it clashes with NM, which
+# directly calls it.
+SYSTEMD_AUTO_ENABLE_pn-dnsmasq = "disable"
+
+# We have the dnsmasq feature disabled for networkmanager in core,
+# but we need this for the gateway. Enable it for the blueprint only.
+PACKAGECONFIG_append_pn-networkmanager = " dnsmasq"