diff --git a/Cargo.toml b/Cargo.toml
index e4b7124..4c2cdd8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,6 @@ opt-level = "s"          # <-
 overflow-checks = false  # <-
 
 [patch.crates-io]
-embassy-executor = { version = "0.3", git = "https://github.com/embassy-rs/embassy", rev = "5f7cd82" }
-embassy-rp = { version = "0.1", git = "https://github.com/embassy-rs/embassy", rev = "5f7cd82" }
-embassy-time = { version = "0.2", git = "https://github.com/embassy-rs/embassy", rev = "5f7cd82" }
+embassy-executor = { version = "0.4", git = "https://github.com/embassy-rs/embassy", rev = "49ee0564" }
+embassy-rp = { version = "0.1", git = "https://github.com/embassy-rs/embassy", rev = "49ee0564" }
+embassy-time = { version = "0.2", git = "https://github.com/embassy-rs/embassy", rev = "49ee0564" }
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 8a0eefe..1373f58 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -30,9 +30,8 @@ cortex-m = { version = "0.7.6", optional = true }
 cortex-m-rt = { version = "0.7.3", optional = true }
 defmt-rtt = { version = "0.4", optional = true }
 panic-probe = { version = "0.3.0", features = ["print-defmt"], optional = true }
-embassy-executor = { version = "0.3", features = [
+embassy-executor = { version = "0.4", features = [
     "defmt",
-    "nightly",
     "arch-cortex-m",
     "executor-thread",
     "integrated-timers",
@@ -51,7 +50,7 @@ tokio = { version = "1.26", default-features = false, features = [
     "macros",
 ], optional = true }
 tokio-serial = { version = "5.4.4", optional = true }
-static_cell = { version = "2", features = ["nightly"] }
+static_cell = "2"
 portable-atomic = "1.6.0"
 
 [features]
diff --git a/examples/rust-toolchain.toml b/examples/rust-toolchain.toml
deleted file mode 100644
index 055c7ec..0000000
--- a/examples/rust-toolchain.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly-2023-12-20"
-components = ["clippy"]
diff --git a/examples/src/bin/embassy.rs b/examples/src/bin/embassy.rs
index 6c16d98..7554bf6 100644
--- a/examples/src/bin/embassy.rs
+++ b/examples/src/bin/embassy.rs
@@ -1,6 +1,5 @@
 #![no_std]
 #![no_main]
-#![feature(type_alias_impl_trait)]
 
 use atat::{
     asynch::{AtatClient, Client},
@@ -49,7 +48,8 @@ async fn main(spawner: Spawner) {
         &RES_SLOT,
         &URC_CHANNEL,
     );
-    let buf = static_cell::make_static!([0; 1024]);
+    static BUF: StaticCell<[u8; 1024]> = StaticCell::new();
+    let buf = BUF.init([0; 1024]);
     let mut client = Client::new(writer, &RES_SLOT, buf, atat::Config::default());
 
     spawner.spawn(ingress_task(ingress, reader)).unwrap();
diff --git a/examples/src/bin/std-tokio.rs b/examples/src/bin/std-tokio.rs
index 3f3469a..9e67bc4 100644
--- a/examples/src/bin/std-tokio.rs
+++ b/examples/src/bin/std-tokio.rs
@@ -1,4 +1,3 @@
-#![feature(type_alias_impl_trait)]
 use atat_examples::common;
 
 use atat::{
@@ -6,6 +5,7 @@ use atat::{
     AtatIngress, Config, DefaultDigester, Ingress, ResponseSlot, UrcChannel,
 };
 use embedded_io_adapters::tokio_1::FromTokio;
+use static_cell::StaticCell;
 use std::process::exit;
 use tokio_serial::SerialStream;
 
@@ -26,7 +26,8 @@ async fn main() -> ! {
         &RES_SLOT,
         &URC_CHANNEL,
     );
-    let buf = static_cell::make_static!([0; 1024]);
+    static BUF: StaticCell<[u8; 1024]> = StaticCell::new();
+    let buf = BUF.init([0; 1024]);
     let mut client = Client::new(FromTokio::new(writer), &RES_SLOT, buf, Config::default());
 
     tokio::spawn(ingress_task(ingress, FromTokio::new(reader)));