diff --git a/Cargo.toml b/Cargo.toml
index 90dbab6a..bd98316e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -116,8 +116,8 @@ object-chain = { workspace = true }
 
 [patch.crates-io]
 # needed because of esp-wifi
-esp-hal-common = { git = "https://github.com/esp-rs/esp-hal.git", rev = "32d1ea0" }
-esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal.git", rev = "32d1ea0" }
+esp-hal-common = { git = "https://github.com/esp-rs/esp-hal.git", rev = "4dd9fbd" }
+esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal.git", rev = "4dd9fbd" }
 
 [patch.'https://github.com/esp-rs/esp-wifi']
 esp-wifi = { git = "https://github.com/bugadani/esp-wifi.git", branch = "dev" }
diff --git a/src/board/hardware/v1.rs b/src/board/hardware/v1.rs
index 7e01bc72..40710f8f 100644
--- a/src/board/hardware/v1.rs
+++ b/src/board/hardware/v1.rs
@@ -79,9 +79,6 @@ impl super::startup::StartupResources {
         let mut system = peripherals.SYSTEM.split();
         let clocks = ClockControl::configure(system.clock_control, CpuClock::Clock240MHz).freeze();
 
-        let mut rtc = Rtc::new(peripherals.RTC_CNTL);
-        rtc.rwdt.disable();
-
         embassy::init(&clocks, SystemTimer::new(peripherals.SYSTIMER));
 
         let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
@@ -144,7 +141,7 @@ impl super::startup::StartupResources {
             }),
             clocks,
             peripheral_clock_control: system.peripheral_clock_control,
-            rtc,
+            rtc: Rtc::new(peripherals.RTC_CNTL),
 
             misc_pins: MiscPins {
                 vbus_detect: io.pins.gpio47.into(),
diff --git a/src/board/hardware/v2.rs b/src/board/hardware/v2.rs
index 8ec7f637..9f2643e5 100644
--- a/src/board/hardware/v2.rs
+++ b/src/board/hardware/v2.rs
@@ -98,9 +98,6 @@ impl super::startup::StartupResources {
         let mut system = peripherals.SYSTEM.split();
         let clocks = ClockControl::configure(system.clock_control, CpuClock::Clock240MHz).freeze();
 
-        let mut rtc = Rtc::new(peripherals.RTC_CNTL);
-        rtc.rwdt.disable();
-
         embassy::init(&clocks, SystemTimer::new(peripherals.SYSTIMER));
 
         let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
@@ -206,8 +203,8 @@ impl super::startup::StartupResources {
                 )
             }),
             clocks,
-            rtc,
             peripheral_clock_control: system.peripheral_clock_control,
+            rtc: Rtc::new(peripherals.RTC_CNTL),
 
             misc_pins: MiscPins {
                 vbus_detect: io.pins.gpio17.into(),