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 a136c32655c1508db5c23e205a3cf0887d2bf76f..6cf443b1aef5d45b293d11bbc2e47134fa70c612 100644
--- a/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
+++ b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
@@ -30,6 +30,3 @@ ST_USERFS = "0"
 # mask out the blueprint layers in the main distro and unmask
 # them only the blueprint distributions.
 BBMASK = ""
-
-# We want hostapd service to start by default for this blueprint
-SYSTEMD_AUTO_ENABLE_pn-hostapd = "enable"
diff --git a/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.conf b/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.conf
deleted file mode 100644
index 77224d381c51d1d76ee70a2efca23e2371711a54..0000000000000000000000000000000000000000
--- a/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# The Wi-Fi interface configured for static IPv4 addresses
-# FIXME: the interface name used here is working in our current
-# hardware setup for the blueprint, but we need to ensure it will work
-# in all cases. Either by link renaming to ensure the correct
-# interface name or by passing the correct interface in the service
-# file to hostapd on the commandline.
-interface=wlan0
-
-# Use the 802.11 Netlink interface driver
-driver=nl80211
-
-# The user-defined name of the network
-ssid=Oniro Project WiFi
-
-# Use the 2.4GHz band
-hw_mode=g
-
-# Use channel 6
-channel=6
-
-# Enable 802.11n
-ieee80211n=1
-
-# Enable WMM
-wmm_enabled=1
-
-# Enable 40MHz channels with 20ns guard interval
-ht_capab=[HT40][SHORT-GI-20][DSSS_CCK-40]
-
-# Accept all MAC addresses
-macaddr_acl=0
-
-# Use WPA authentication
-auth_algs=1
-
-# Require clients to know the network name
-ignore_broadcast_ssid=0
-
-# Use WPA2
-wpa=2
-
-# Use a pre-shared key
-wpa_key_mgmt=WPA-PSK
-
-# The network passphrase
-wpa_passphrase=12345678
-
-# Use AES, instead of TKIP
-rsn_pairwise=CCMP
diff --git a/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.service b/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.service
deleted file mode 100644
index db958b11f305346931669b5e56dbdb0d477f0940..0000000000000000000000000000000000000000
--- a/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=@SBINDIR@/hostapd @SYSCONFDIR@/hostapd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-oniro-blueprints/recipes-connectivity/hostapd/hostapd_%.bbappend b/meta-oniro-blueprints/recipes-connectivity/hostapd/hostapd_%.bbappend
deleted file mode 100644
index a6062eb6c6d92741e5f294c0b6e334dfd56c21ad..0000000000000000000000000000000000000000
--- a/meta-oniro-blueprints/recipes-connectivity/hostapd/hostapd_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI_append = "file://hostapd.conf \
-                  file://hostapd.service \
-                 "
-
-do_install_append() {
-    install -m 0644 ${WORKDIR}/hostapd.conf ${D}${sysconfdir}
-}
diff --git a/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend b/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
index 5d39bad26fead7fa912341b3b444590a1b8e5cc0..e4e1fcca394b043e5934b5f8febeefc0522ccb5f 100644
--- a/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
+++ b/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
@@ -9,7 +9,6 @@ PACKAGES_append = "\
 
 RDEPENDS_packagegroup-thread-br = "\
     ${@bb.utils.contains("DISTRO_FEATURES", "thread-border-router", "ot-br-posix", "", d)} \
-    hostapd \
     iptables \
     tayga \
     "