diff --git a/components/esp_pm/linker.lf b/components/esp_pm/linker.lf
index e857a09487..cd783b7ae9 100644
--- a/components/esp_pm/linker.lf
+++ b/components/esp_pm/linker.lf
@@ -94,3 +94,10 @@ entries:
     if SOC_TEMP_SENSOR_SUPPORTED = y:
         if PM_SLP_IRAM_OPT = y:
             temperature_sensor_hal:temperature_sensor_hal_get_raw_value (noflash)
+
+[mapping:esp_hal_gpio_pm]
+archive: libesp_hal_gpio.a
+entries:
+    if PM_SLP_IRAM_OPT = y:
+        if IDF_TARGET_ESP32 = y:
+            rtc_io_periph:rtc_io_desc (noflash_data)
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index d8cc674234..f1b31f96ca 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit d8cc674234419ff36cf943c4d8d036e06795cde4
+Subproject commit f1b31f96ca256e6a807a4bc484f77bce167dbddf
diff --git a/examples/wifi/power_save/sdkconfig.ci.default b/examples/wifi/power_save/sdkconfig.ci.default
index 4054e1490a..fb291f2d8a 100644
--- a/examples/wifi/power_save/sdkconfig.ci.default
+++ b/examples/wifi/power_save/sdkconfig.ci.default
@@ -1 +1,2 @@
 CONFIG_EXAMPLE_GET_AP_INFO_FROM_STDIN=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y