diff --git a/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg b/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
index 754bc9b..3f1014b 100644
--- a/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
+++ b/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
@@ -3669,7 +3669,6 @@ libnpth0-1.6-r0.corei7_64
 libnsl2-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnsl-dev-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnss-db2-2.29-r0.corei7_64
-libnss-mdns-0.10-r7.corei7_64
 libnss-myhostname2-241+0+d1cc09a6ea-r0.corei7_64
 libpam-1.3.0-r5.corei7_64
 libpam-dev-1.3.0-r5.corei7_64
@@ -4083,7 +4082,6 @@ packagegroup-base-pci-1.0-r83.intel_corei7_64
 packagegroup-base-usbgadget-1.0-r83.intel_corei7_64
 packagegroup-base-usbhost-1.0-r83.intel_corei7_64
 packagegroup-base-wifi-1.0-r83.intel_corei7_64
-packagegroup-base-zeroconf-1.0-r83.intel_corei7_64
 packagegroup-basic-1.0-r13.intel_corei7_64
 packagegroup-core-base-utils-1.0-r0.noarch
 packagegroup-core-boot-1.0-r17.intel_corei7_64
diff --git a/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg b/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
index fff7ac9..3a80ebd 100644
--- a/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
+++ b/meta-stx-distro/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
@@ -3658,7 +3658,6 @@ libnpth0-1.6-r0.corei7_64
 libnsl2-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnsl-dev-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnss-db2-2.29-r0.corei7_64
-libnss-mdns-0.10-r7.corei7_64
 libnss-myhostname2-241+0+d1cc09a6ea-r0.corei7_64
 libpam-1.3.0-r5.corei7_64
 libpam-dev-1.3.0-r5.corei7_64
@@ -4075,7 +4074,6 @@ packagegroup-base-pci-1.0-r83.intel_corei7_64
 packagegroup-base-usbgadget-1.0-r83.intel_corei7_64
 packagegroup-base-usbhost-1.0-r83.intel_corei7_64
 packagegroup-base-wifi-1.0-r83.intel_corei7_64
-packagegroup-base-zeroconf-1.0-r83.intel_corei7_64
 packagegroup-basic-1.0-r13.intel_corei7_64
 packagegroup-core-base-utils-1.0-r0.noarch
 packagegroup-core-boot-1.0-r17.intel_corei7_64
diff --git a/meta-stx-distro/conf/distro/include/stx-features.inc b/meta-stx-distro/conf/distro/include/stx-features.inc
index 3f83f5c..c7d37fc 100644
--- a/meta-stx-distro/conf/distro/include/stx-features.inc
+++ b/meta-stx-distro/conf/distro/include/stx-features.inc
@@ -36,6 +36,10 @@ DISTRO_FEATURES_append = " kvm"
 DISTRO_FEATURES_append = " openstack"
 PREFERRED_PROVIDER_virtual/containerd = "containerd-opencontainers"
 
+# packagegroup-base-zeroconf depends on libnss-mdns which breaks
+# the dns resolution for StarlingX
+DISTRO_FEATURES_remove = "zeroconf"
+
 #Graphics and misc
 #DISTRO_FEATURES_append = " x11 opengl"
 #EXTRA_IMAGE_FEATURES_append = " x11-base"
diff --git a/meta-stx-integ/recipes-connectivity/avahi/avahi_%.bbappend b/meta-stx-integ/recipes-connectivity/avahi/avahi_%.bbappend
new file mode 100644
index 0000000..795ccf6
--- /dev/null
+++ b/meta-stx-integ/recipes-connectivity/avahi/avahi_%.bbappend
@@ -0,0 +1,2 @@
+RRECOMMENDS_${PN}_remove_libc-glibc = "libnss-mdns"
+RRECOMMENDS_${PN}-daemon_remove_libc-glibc = "libnss-mdns"