diff --git a/components/bt/controller/lib_esp32h4/esp32h4-bt-lib b/components/bt/controller/lib_esp32h4/esp32h4-bt-lib
index c863bbae756..139b2ffa0c6 160000
--- a/components/bt/controller/lib_esp32h4/esp32h4-bt-lib
+++ b/components/bt/controller/lib_esp32h4/esp32h4-bt-lib
@@ -1 +1 @@
-Subproject commit c863bbae75649d5f679aecbf75d9ef336a5ab6d7
+Subproject commit 139b2ffa0c6ea29faef6bc8f3b2cc6d13e1291fb
diff --git a/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock.c b/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock.c
index 3a12d4fd122..4570fd9df9f 100644
--- a/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock.c
+++ b/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock.c
@@ -33,7 +33,7 @@ esp_err_t sleep_clock_system_retention_init(void *arg)
     #undef N_REGS_PCR
 }
 
-#if CONFIG_MAC_BB_PD || CONFIG_BT_LE_SLEEP_ENABLE || CONFIG_IEEE802154_SLEEP_ENABLE || SOC_PM_MODEM_CLK_CONF_RETENTION
+#if CONFIG_MAC_BB_PD || CONFIG_BT_CTRL_SLEEP_ENABLE || CONFIG_IEEE802154_SLEEP_ENABLE || SOC_PM_MODEM_CLK_CONF_RETENTION
 esp_err_t sleep_clock_modem_retention_init(void *arg)
 {
     #define N_REGS_SYSCON() (((MODEM_SYSCON_MEM_RF2_CONF_REG - MODEM_SYSCON_TEST_CONF_REG) / 4) + 1)
@@ -120,7 +120,7 @@ ESP_SYSTEM_INIT_FN(sleep_clock_startup_init, SECONDARY, BIT(0), 106)
     };
     sleep_retention_module_init(SLEEP_RETENTION_MODULE_CLOCK_SYSTEM, &init_param);
 
-#if CONFIG_MAC_BB_PD || CONFIG_BT_LE_SLEEP_ENABLE || CONFIG_IEEE802154_SLEEP_ENABLE || SOC_PM_MODEM_CLK_CONF_RETENTION
+#if CONFIG_MAC_BB_PD || CONFIG_BT_CTRL_SLEEP_ENABLE || CONFIG_IEEE802154_SLEEP_ENABLE || SOC_PM_MODEM_CLK_CONF_RETENTION
     init_param = (sleep_retention_module_init_param_t) {
         .cbs       = { .create = { .handle = sleep_clock_modem_retention_init, .arg = NULL } },
 #if !SOC_PM_MODEM_CLK_CONF_RETENTION
diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
index f8477634d33..5781683bfeb 100644
--- a/components/esp_hw_support/sleep_modes.c
+++ b/components/esp_hw_support/sleep_modes.c
@@ -716,6 +716,7 @@ static SLEEP_FN_ATTR void misc_modules_wake_prepare(uint32_t sleep_flags)
 #if CONFIG_ESP_ENABLE_PVT && SOC_PVT_EN_WITH_SLEEP
     pvt_func_enable(true);
 #endif
+
 #if CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP && SOC_WDT_SUPPORTED
     if (sleep_flags & PMU_SLEEP_PD_TOP) {
         // There is no driver to manage the flashboot watchdog, and it is definitely be in off state when
diff --git a/components/soc/esp32h4/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h4/include/soc/Kconfig.soc_caps.in
index 60c21e7e939..4fe21964b26 100644
--- a/components/soc/esp32h4/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32h4/include/soc/Kconfig.soc_caps.in
@@ -1051,6 +1051,10 @@ config SOC_PHY_DIG_REGS_MEM_SIZE
     int
     default 21
 
+config SOC_PM_SUPPORT_BT_WAKEUP
+    bool
+    default y
+
 config SOC_PM_SUPPORT_EXT1_WAKEUP
     bool
     default y
diff --git a/components/soc/esp32h4/include/soc/soc_caps.h b/components/soc/esp32h4/include/soc/soc_caps.h
index c8ccd0431a4..6fcce0e6a7b 100644
--- a/components/soc/esp32h4/include/soc/soc_caps.h
+++ b/components/soc/esp32h4/include/soc/soc_caps.h
@@ -467,7 +467,7 @@
 
 // TODO: IDF-12286 (inherit from verify code, need check)
 /*-------------------------- Power Management CAPS ----------------------------*/
-// #define SOC_PM_SUPPORT_BT_WAKEUP        (1)
+#define SOC_PM_SUPPORT_BT_WAKEUP        (1)
 #define SOC_PM_SUPPORT_EXT1_WAKEUP      (1)
 #define SOC_PM_SUPPORT_EXT1_WAKEUP_MODE_PER_PIN   (1) /*!<Supports one bit per pin to configure the EXT1 trigger level */
 #define SOC_PM_SUPPORT_TOUCH_WAKEUP     (1)
diff --git a/examples/bluetooth/nimble/power_save/README.md b/examples/bluetooth/nimble/power_save/README.md
index cf273d91741..acb9f49e19d 100644
--- a/examples/bluetooth/nimble/power_save/README.md
+++ b/examples/bluetooth/nimble/power_save/README.md
@@ -28,6 +28,8 @@ This example contains some build configurations. For each configuration, a few c
 - `sdkconfig.40m.esp32c61`: ESP32C61 uses main XTAL as low power clock in light sleep enabled.
 - `sdkconfig.defaults.esp32s31`: ESP32S31 uses 32kHz XTAL as low power clock in light sleep enabled.
 - `sdkconfig.40m.esp32s31`: ESP32S31 uses main XTAL as low power clock in light sleep enabled.
+- `sdkconfig.defaults.esp32h4`: ESP32H4 uses 32kHz XTAL as low power clock in light sleep enabled.
+- `sdkconfig.32m.esp32h4`: ESP32H4 uses main XTAL as low power clock in light sleep enabled.
 
 ## How to use example
 
diff --git a/examples/bluetooth/nimble/power_save/main/Kconfig.projbuild b/examples/bluetooth/nimble/power_save/main/Kconfig.projbuild
index c82e83638a7..733f7c2804a 100644
--- a/examples/bluetooth/nimble/power_save/main/Kconfig.projbuild
+++ b/examples/bluetooth/nimble/power_save/main/Kconfig.projbuild
@@ -3,8 +3,8 @@ menu "Example Configuration"
     choice EXAMPLE_MAX_CPU_FREQ
         prompt "Maximum CPU frequency"
         default EXAMPLE_MAX_CPU_FREQ_160 if !IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP32C2 && \
-            !IDF_TARGET_ESP32C5 && !IDF_TARGET_ESP32S31
-        default EXAMPLE_MAX_CPU_FREQ_96 if IDF_TARGET_ESP32H2
+            !IDF_TARGET_ESP32C5 && !IDF_TARGET_ESP32H4 && !IDF_TARGET_ESP32S31
+        default EXAMPLE_MAX_CPU_FREQ_96 if IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32H4
         default EXAMPLE_MAX_CPU_FREQ_120 if IDF_TARGET_ESP32C2
         default EXAMPLE_MAX_CPU_FREQ_240 if IDF_TARGET_ESP32C5
         default EXAMPLE_MAX_CPU_FREQ_320 if IDF_TARGET_ESP32S31
@@ -16,7 +16,7 @@ menu "Example Configuration"
             bool "80 MHz"
         config EXAMPLE_MAX_CPU_FREQ_96
             bool "96 MHz"
-            depends on IDF_TARGET_ESP32H2
+            depends on IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32H4
         config EXAMPLE_MAX_CPU_FREQ_160
             bool "160 MHz"
         config EXAMPLE_MAX_CPU_FREQ_120
@@ -41,9 +41,10 @@ menu "Example Configuration"
 
     choice EXAMPLE_MIN_CPU_FREQ
         prompt "Minimum CPU frequency"
-        default EXAMPLE_MIN_CPU_FREQ_40M if !IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP32C2 && !IDF_TARGET_ESP32C5
+        default EXAMPLE_MIN_CPU_FREQ_40M if !IDF_TARGET_ESP32H2 && !IDF_TARGET_ESP32C2 && \
+            !IDF_TARGET_ESP32C5 && !IDF_TARGET_ESP32H4
         default EXAMPLE_MIN_CPU_FREQ_48M if IDF_TARGET_ESP32C5
-        default EXAMPLE_MIN_CPU_FREQ_32M if IDF_TARGET_ESP32H2
+        default EXAMPLE_MIN_CPU_FREQ_32M if IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32H4
         default EXAMPLE_MIN_CPU_FREQ_26M if IDF_TARGET_ESP32C2
         depends on PM_ENABLE
         help
@@ -67,7 +68,7 @@ menu "Example Configuration"
             depends on XTAL_FREQ_40 || XTAL_FREQ_AUTO
         config EXAMPLE_MIN_CPU_FREQ_32M
             bool "32 MHz (use with 32MHz XTAL)"
-            depends on IDF_TARGET_ESP32H2
+            depends on IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32H4
             depends on XTAL_FREQ_32 || XTAL_FREQ_AUTO
         config EXAMPLE_MIN_CPU_FREQ_26M
             bool "26 MHz (use with 26MHz XTAL)"
diff --git a/examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h4 b/examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h4
new file mode 100644
index 00000000000..2b80206b234
--- /dev/null
+++ b/examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h4
@@ -0,0 +1,23 @@
+CONFIG_IDF_TARGET="esp32h4"
+
+# Bluetooth Low Power Config
+CONFIG_BT_CTRL_SLEEP_ENABLE=y
+CONFIG_BT_LE_LP_CLK_SRC_MAIN_XTAL=y
+
+#
+# Power Management
+#
+CONFIG_PM_ENABLE=y
+CONFIG_PM_DFS_INIT_AUTO=y
+CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
+# end of Power Management
+
+CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
+CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
+
+#
+# Sleep Config
+#
+CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
+# end of Sleep Config
diff --git a/examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h4 b/examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h4
new file mode 100644
index 00000000000..9ae22dda16e
--- /dev/null
+++ b/examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h4
@@ -0,0 +1,29 @@
+CONFIG_IDF_TARGET="esp32h4"
+
+# Bluetooth Low Power Config
+CONFIG_BT_CTRL_SLEEP_ENABLE=y
+CONFIG_BT_LE_LP_CLK_SRC_DEFAULT=y
+
+#
+# Power Management
+#
+CONFIG_PM_ENABLE=y
+CONFIG_PM_DFS_INIT_AUTO=y
+CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
+CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
+# end of Power Management
+
+CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING=y
+
+#
+# Sleep Config
+#
+CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
+CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION=y
+# end of Sleep Config
+
+#
+# RTC Clock Config
+#
+CONFIG_RTC_CLK_SRC_EXT_CRYS=y
+# end of RTC Clock Config