diff --git a/Cargo.lock b/Cargo.lock
index 660ec2242..d68143696 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1127,7 +1127,7 @@ dependencies = [
 [[package]]
 name = "embassy-executor"
 version = "0.6.0"
-source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-2024-08-18-wakers#c17dc6cc90d6b9e8c18c8b0ea58c1a4dd868b6f1"
+source = "git+https://github.com/kaspar030/embassy?branch=for-riot-rs-2024-08-18#164b3a99efbeccc442971b63dc1b90f03db637ea"
 dependencies = [
  "cortex-m",
  "critical-section",
diff --git a/Cargo.toml b/Cargo.toml
index aa5a5a6bf..392f3db1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -117,7 +117,7 @@ opt-level = 3
 
 [patch.crates-io]
 # riot-rs embassy fork
-embassy-executor = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-2024-08-18-wakers" }
+embassy-executor = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-2024-08-18" }
 embassy-hal-internal = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-2024-08-18" }
 embassy-nrf = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-2024-08-18" }
 embassy-net = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-2024-08-18" }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 7f6d383b4..e213ca1b7 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,7 +1,7 @@
 # this file is parsed with grep & sed for parsing out the actual toolchain
 # from the "channel" line. Please keep that in mind when modifying.
 [toolchain]
-channel = "nightly-2024-09-16"
+channel = "nightly-2024-07-31"
 targets = [
   "thumbv6m-none-eabi",
   "thumbv7m-none-eabi",