diff --git a/drivers/wifi/nrf700x/Kconfig b/drivers/wifi/nrf700x/Kconfig
index 7681488b80d0..624b8423a4f4 100644
--- a/drivers/wifi/nrf700x/Kconfig
+++ b/drivers/wifi/nrf700x/Kconfig
@@ -404,26 +404,25 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
 		The number of seconds after which AP is declared dead if no beacons
 		are received from the AP. Used to detect AP silently going down e.g., power off.
 
-choice NRF_WIFI_PS_DATA_RETRIEVAL_MECHANISM
-	prompt "Power save data retrieval mechanism"
-	default NRF_WIFI_PS_POLL_BASED_RETRIEVAL
+choice NRF_WIFI_PS_EXIT_STRATEGY
+	prompt "Power save exit strategy"
+	default NRF_WIFI_PS_INT_PS
 	help
-	  Select the mechanism to retrieve buffered data from AP.
+	  Select the power save exit strategy to retrieve buffered data from AP.
 
-config NRF_WIFI_PS_POLL_BASED_RETRIEVAL
-	bool "PS-Poll frame based mechanism to retrieve buffered data from AP"
+config NRF_WIFI_PS_EXIT_EVERY_TIM
+	bool "Exit power save every time to retrieve buffered data from AP"
 	help
-	  When AP notifies about availability of buffered data, the STA stays in power save
-	  and retrieves the frames one-by-one, this conserved more power but adds latency
-	  to the traffic. Ideal for minimum number of frames.
+	  Exit power save every time to retrieve buffered data from AP. Entering back to
+	  power save mode might take some time and power.
 
-config NRF_WIFI_QOS_NULL_BASED_RETRIEVAL
-	bool "QoS null frame based mechanism to retrieve buffered data from AP"
+config NRF_WIFI_PS_INT_PS
+	bool "Exit power save based on an intelligent algorithm"
 	help
-	  When AP notifies about availability of buffered data, the STA comes out of
-	  power save and then AP can deliver all buffered frames without any additional
-	  overhead or latency, but STA enters power save after a delay costing more power
-	  depending on the delay. Ideal for heavy buffered traffic.
+	  Exit power save based on an intelligent algorithm to retrieve buffered data from AP.
+	  The algorithm tracks the buffered data at the AP and then dynamically decides
+	  whether to stay in PS (for lower amount of buffered data) or exit PS (for higher
+	  amount of buffered data).
 
 endchoice
 
diff --git a/drivers/wifi/nrf700x/osal/fw_if/umac_if/src/cmd.c b/drivers/wifi/nrf700x/osal/fw_if/umac_if/src/cmd.c
index a95557f9b9e0..b9e7b2f2034c 100644
--- a/drivers/wifi/nrf700x/osal/fw_if/umac_if/src/cmd.c
+++ b/drivers/wifi/nrf700x/osal/fw_if/umac_if/src/cmd.c
@@ -213,11 +213,11 @@ enum nrf_wifi_status umac_cmd_init(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
 		umac_cmd_data->disable_beamforming = 1;
 	}
 
-#if defined(CONFIG_NRF_WIFI_QOS_NULL_BASED_RETRIEVAL)
-	umac_cmd_data->ps_exit_strategy = CUSTOM;
+#if defined(CONFIG_NRF_WIFI_PS_INT_PS)
+	umac_cmd_data->ps_exit_strategy = INT_PS;
 #else
 	umac_cmd_data->ps_exit_strategy = EVERY_TIM;
-#endif  /* CONFIG_NRF_WIFI_QOS_NULL_BASED_RETRIEVAL */
+#endif  /* CONFIG_NRF_WIFI_PS_INT_PS */
 
 	status = nrf_wifi_hal_ctrl_cmd_send(fmac_dev_ctx->hal_dev_ctx,
 					    umac_cmd,