diff --git a/Dockerfile b/Dockerfile
index aa454c209..8f414ccc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
     # Manually sync this with rust-toolchain.toml!
-    RUST_VERSION=nightly-2023-02-14 \
+    RUST_VERSION=nightly-2023-04-05 \
     RUST_COMPONENTS="rust-src"
 
 RUN set -eux; \
diff --git a/benches/netbench/Cargo.toml b/benches/netbench/Cargo.toml
index d6e983320..9abd58d98 100644
--- a/benches/netbench/Cargo.toml
+++ b/benches/netbench/Cargo.toml
@@ -10,7 +10,7 @@ description = "A Rust program to measure bandwidth or latency over a Rust TCP co
 
 [dependencies]
 bytes = "1.1"
-clap = {verstion ="4.1", features = ["derive"] }
+clap = {version ="4.1", features = ["derive"] }
 core_affinity = "0.8"
 hdrhist = "0.5"
 
diff --git a/examples/demo/src/tests/thread_local.rs b/examples/demo/src/tests/thread_local.rs
index 3b286323f..43067acc1 100644
--- a/examples/demo/src/tests/thread_local.rs
+++ b/examples/demo/src/tests/thread_local.rs
@@ -1,9 +1,9 @@
 pub fn test_thread_local() -> Result<(), ()> {
-	#[repr(align(0x1000))]
-	struct OverAligned(u8);
+	#[repr(align(0x10))]
+	struct Aligned(u8);
 
 	thread_local! {
-		static THREAD_LOCAL: OverAligned = const { OverAligned(0x42) };
+		static THREAD_LOCAL: Aligned = const { Aligned(0x42) };
 	}
 
 	THREAD_LOCAL.with(|thread_local| {
diff --git a/libhermit-rs b/libhermit-rs
index 2203b5ae3..021faacef 160000
--- a/libhermit-rs
+++ b/libhermit-rs
@@ -1 +1 @@
-Subproject commit 2203b5ae3dfc247c34098003c47ea1af2613cb66
+Subproject commit 021faacef3cd0ecc95dee5a19977526b03a21324
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 19dc77039..5a0c7481c 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 # Manually sync this with Dockerfile!
-channel = "nightly-2023-03-15"
+channel = "nightly-2023-04-05"
 components = [ "rust-src" ]