diff --git a/esp-hal/src/rtc_cntl/sleep/esp32s2.rs b/esp-hal/src/rtc_cntl/sleep/esp32s2.rs
index e721d2780c4..a99997873f0 100644
--- a/esp-hal/src/rtc_cntl/sleep/esp32s2.rs
+++ b/esp-hal/src/rtc_cntl/sleep/esp32s2.rs
@@ -2,6 +2,7 @@ use super::{
     Ext0WakeupSource,
     Ext1WakeupSource,
     TimerWakeupSource,
+    UlpWakeupSource,
     WakeSource,
     WakeTriggers,
     WakeupLevel,
@@ -73,6 +74,12 @@ pub const RTC_MEM_POWERUP_CYCLES: u8 = OTHER_BLOCKS_POWERUP;
 /// RTC memory wait cycles.
 pub const RTC_MEM_WAIT_CYCLES: u16 = OTHER_BLOCKS_WAIT;
 
+impl WakeSource for UlpWakeupSource {
+    fn apply(&self, _rtc: &Rtc<'_>, triggers: &mut WakeTriggers, _sleep_config: &mut RtcSleepConfig) {
+        triggers.set_ulp(true);
+    }
+}
+
 impl WakeSource for TimerWakeupSource {
     fn apply(
         &self,
diff --git a/esp-hal/src/rtc_cntl/sleep/esp32s3.rs b/esp-hal/src/rtc_cntl/sleep/esp32s3.rs
index 294078027ff..978f78d823d 100644
--- a/esp-hal/src/rtc_cntl/sleep/esp32s3.rs
+++ b/esp-hal/src/rtc_cntl/sleep/esp32s3.rs
@@ -2,6 +2,7 @@ use super::{
     Ext0WakeupSource,
     Ext1WakeupSource,
     TimerWakeupSource,
+    UlpWakeupSource,
     WakeSource,
     WakeTriggers,
     WakeupLevel,
@@ -81,6 +82,13 @@ pub const RTC_MEM_POWERUP_CYCLES: u8 = OTHER_BLOCKS_POWERUP;
 /// RTC memory wait cycles.
 pub const RTC_MEM_WAIT_CYCLES: u16 = OTHER_BLOCKS_WAIT;
 
+impl WakeSource for UlpWakeupSource {
+    fn apply(&self, _rtc: &Rtc<'_>, triggers: &mut WakeTriggers, _sleep_config: &mut RtcSleepConfig) {
+        triggers.set_ulp_fsm(true);
+        triggers.set_ulp_riscv(true);
+    }
+}
+
 impl WakeSource for TimerWakeupSource {
     fn apply(
         &self,
diff --git a/esp-hal/src/rtc_cntl/sleep/mod.rs b/esp-hal/src/rtc_cntl/sleep/mod.rs
index 898fc62871f..6293d95755b 100644
--- a/esp-hal/src/rtc_cntl/sleep/mod.rs
+++ b/esp-hal/src/rtc_cntl/sleep/mod.rs
@@ -348,6 +348,29 @@ impl Default for WakeFromLpCoreWakeupSource {
     }
 }
 
+/// ULP-FSM wakeup source
+///
+/// Wake up from ULP-FSM or ULP-RISCV interrupt.
+/// This wakeup source can be used to wake up from both light and deep sleep.
+/// Does not enable ULP-RISCV TRAP wake-up.
+#[cfg(any(esp32s2,esp32s3))]
+pub struct UlpWakeupSource {}
+
+#[cfg(any(esp32s2,esp32s3))]
+impl UlpWakeupSource {
+    /// Create a new instance of `WakeFromUlpWakeupSource`
+    pub fn new() -> Self {
+        Self {}
+    }
+}
+
+#[cfg(any(esp32s2,esp32s3))]
+impl Default for UlpWakeupSource {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// GPIO wakeup source
 ///
 /// Wake up from GPIO high or low level. Any pin can be used with this wake up
@@ -468,13 +491,15 @@ bitfield::bitfield! {
     pub uart1, set_uart1: 7;
     /// Touch wakeup
     pub touch, set_touch: 8;
-    /// ULP-FSM wakeup
+    /// ULP-FSM or ULP-RISCV wakeup
     pub ulp, set_ulp: 11;
+    /// ULP-RISCV trap wakeup
+    pub ulp_riscv_trap, set_ulp_riscv_trap: 13;
     /// USB wakeup
     pub usb, set_usb: 15;
 }
 
-#[cfg(any(esp32, esp32c2, esp32c3, esp32s3))]
+#[cfg(esp32s3)]
 bitfield::bitfield! {
     /// Represents the wakeup triggers.
     #[derive(Default, Clone, Copy)]
@@ -498,7 +523,42 @@ bitfield::bitfield! {
     pub uart1, set_uart1: 7;
     /// Touch wakeup
     pub touch, set_touch: 8;
-    /// ULP wakeup
+    /// ULP-FSM wakeup
+    pub ulp_fsm, set_ulp_fsm: 9;
+    /// BT wakeup (light sleep only)
+    pub bt, set_bt: 10;
+    /// ULP-RISCV wakeup 
+    pub ulp_riscv, set_ulp_riscv: 11;
+    /// ULP-RISCV trap wakeup 
+    pub ulp_riscv_trap, set_ulp_riscv_trap: 13;
+}
+
+
+#[cfg(any(esp32, esp32c2, esp32c3))]
+bitfield::bitfield! {
+    /// Represents the wakeup triggers.
+    #[derive(Default, Clone, Copy)]
+    pub struct WakeTriggers(u16);
+    impl Debug;
+    /// EXT0 GPIO wakeup
+    pub ext0, set_ext0: 0;
+    /// EXT1 GPIO wakeup
+    pub ext1, set_ext1: 1;
+    /// GPIO wakeup (light sleep only)
+    pub gpio, set_gpio: 2;
+    /// Timer wakeup
+    pub timer, set_timer: 3;
+    /// SDIO wakeup (light sleep only)
+    pub sdio, set_sdio: 4;
+    /// MAC wakeup (light sleep only)
+    pub mac, set_mac: 5;
+    /// UART0 wakeup (light sleep only)
+    pub uart0, set_uart0: 6;
+    /// UART1 wakeup (light sleep only)
+    pub uart1, set_uart1: 7;
+    /// Touch wakeup
+    pub touch, set_touch: 8;
+    /// ULP-FSM wakeup
     pub ulp, set_ulp: 9;
     /// BT wakeup (light sleep only)
     pub bt, set_bt: 10;
diff --git a/esp-lp-hal/src/lib.rs b/esp-lp-hal/src/lib.rs
index 7760927d950..23b058668f2 100644
--- a/esp-lp-hal/src/lib.rs
+++ b/esp-lp-hal/src/lib.rs
@@ -65,6 +65,16 @@ pub fn wake_hp_core() {
         .write(|w| w.lp_trigger_hp().set_bit());
 }
 
+/// Wake up the HP core
+#[cfg(any(feature = "esp32s2", feature = "esp32s3"))]
+#[unsafe(link_section = ".init.rust")]
+#[unsafe(no_mangle)]
+pub fn wake_hp_core() {
+    unsafe { &*pac::RTC_CNTL::PTR }
+        .rtc_state0()
+        .write(|w|w.rtc_sw_cpu_int().set_bit());
+}
+
 #[cfg(feature = "esp32c6")]
 global_asm!(
     r#"