diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
index af3e7827dcb..4b3bb0d41ca 100644
--- a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
+++ b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -840,7 +840,7 @@ if NRF_WIFI_FEAT_KEEPALIVE
 config NRF_WIFI_KEEPALIVE_PERIOD_S
 	int "Keepalive period in seconds"
 	range 30 3600
-	default 60
+	default 30
 	help
 	  Keepalive period in seconds to send keepalive packets to the AP.
 endif
diff --git a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
index 1ef412df7f7..21f7600ca80 100644
--- a/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
+++ b/drivers/wifi/nrf_wifi/src/wpa_supp_if.c
@@ -1807,6 +1807,11 @@ int nrf_wifi_supp_get_capa(void *if_priv, struct wpa_driver_capa *capa)
 		capa->extended_capa_mask = rpu_ctx_zep->extended_capa_mask;
 		capa->extended_capa_len = rpu_ctx_zep->extended_capa_len;
 	}
+	/* Based on testing, this works to fix the disconnection due to delayed
+	 * keepalive to the AP
+	 */
+	capa->driver_tx_processing_delay_ms = 1000;
+
 out:
 	k_mutex_unlock(&vif_ctx_zep->vif_lock);
 	return status;
diff --git a/subsys/net/l2/wifi/Kconfig b/subsys/net/l2/wifi/Kconfig
index 7728678cc97..49d061c7439 100644
--- a/subsys/net/l2/wifi/Kconfig
+++ b/subsys/net/l2/wifi/Kconfig
@@ -158,7 +158,7 @@ endif # WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 config WIFI_MGMT_BSS_MAX_IDLE_TIME
 	int "BSS max idle timeout in seconds"
 	range 0 64000
-	default 30
+	default 300
 	help
 	  As per 802.11-2020: 11.21.13 BSS max idle period management
 	  If dot11WirelessManagementImplemented is true, dot11BSSMaxIdlePeriod is
diff --git a/west.yml b/west.yml
index 157ee35fc4d..41fa45c8693 100644
--- a/west.yml
+++ b/west.yml
@@ -281,7 +281,7 @@ manifest:
         - hal
     - name: hostap
       path: modules/lib/hostap
-      revision: e7feee399bb6ebd185067e512873869c5556e24c
+      revision: c55683ce514953277be5566fceb38c4c2485f1e1
     - name: liblc3
       revision: 48bbd3eacd36e99a57317a0a4867002e0b09e183
       path: modules/lib/liblc3