diff --git a/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc
index 0c37727f3e3929f6ce04c0eb1d4a67db10ec8b73..2e5bab7507edfa6f3493bdb3b0c677ccc443777b 100644
--- a/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc
+++ b/meta-oniro-core/conf/distro/include/oniro-packageconfig.inc
@@ -4,3 +4,10 @@
 
 # Define the configuration set as per our distro policy
 PACKAGECONFIG_pn-networkmanager = "nss systemd bluez5 wifi"
+
+# We have no use for dlt-daemon as we use systemd for logging
+PACKAGECONFIG_remove_pn-mosquitto = "dlt"
+
+# We use NetworkManager as the default network manager (included in our
+# reference images).
+PACKAGECONFIG_remove_pn-systemd = "networkd"
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 56618a92c924b412bb6cc0d52ab5b75de6817ff6..28e250444fcfa2e25efe936025cbc37124654e3a 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -115,13 +115,6 @@ PREFERRED_PROVIDER_virtual/kernel_qemux86-64 = "linux-oniro"
 # Default to enabling serial debug console on RaspberryPi
 ENABLE_UART ?= "1"
 
-# We have no use for dlt-daemon as we use systemd for logging
-PACKAGECONFIG_remove_pn-mosquitto = "dlt"
-
-# We use NetworkManager as the default network manager (included in our
-# reference images).
-PACKAGECONFIG_remove_pn-systemd = "networkd"
-
 # The KMS driver for RPI4 requires a different vc4 overlay for Raspberry Pi 4.
 # This is done dynamically through overlay_map.dtb. More info:
 # https://www.raspberrypi.com/documentation/computers/configuration.html#part2.2.10