diff --git a/package/gluon-mesh-wireless-sae/Makefile b/package/gluon-mesh-wireless-sae/Makefile
index 6b3fd271..51fff6ff 100644
--- a/package/gluon-mesh-wireless-sae/Makefile
+++ b/package/gluon-mesh-wireless-sae/Makefile
@@ -6,7 +6,7 @@ include ../gluon.mk
 
 define Package/gluon-mesh-wireless-sae
   TITLE:=Encryption of 802.11s Mesh Links through SAE
-  DEPENDS:=+gluon-core +wpa-supplicant-mesh-wolfssl
+  DEPENDS:=+gluon-core +wpa-supplicant-mesh-mbedtls
 endef
 
 $(eval $(call BuildPackageGluon,gluon-mesh-wireless-sae))
diff --git a/package/gluon-wireless-encryption-wpa3/Makefile b/package/gluon-wireless-encryption-wpa3/Makefile
index 871266b2..364ba210 100644
--- a/package/gluon-wireless-encryption-wpa3/Makefile
+++ b/package/gluon-wireless-encryption-wpa3/Makefile
@@ -5,7 +5,7 @@ PKG_NAME:=gluon-wireless-encryption-wpa3
 include ../gluon.mk
 
 define Package/gluon-wireless-encryption-wpa3
-  DEPENDS:=+hostapd-wolfssl
+  DEPENDS:=+hostapd-mbedtls
   TITLE:=Package for supporting WPA3 encrypted wireless networks
 endef
 
diff --git a/targets/generic b/targets/generic
index b0b42faf..ed2b4b23 100644
--- a/targets/generic
+++ b/targets/generic
@@ -105,7 +105,7 @@ packages {
 	'-ppp-mod-pppoe',
 	'-wpad-mini',
 	'-wpad-basic',
-	'-wpad-basic-wolfssl',
+	'-wpad-basic-mbedtls',
 	'-firewall4',
 	'gluon-core',
 	'ip6tables-zz-legacy',