diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c147a7f84..a9c7304a0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,12 +69,14 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo install cargo-cargofmt
       - uses: actions/checkout@v6
       - uses: mkroening/rust-toolchain-toml@main
       - run: rustup component add rustfmt
       - run: |
-          cargo fmt --all --check
-          cargo fmt --all --check --manifest-path hermit-builtins/Cargo.toml
+          cargo cargofmt --all --check
+          cargo cargofmt --all --check --manifest-path hermit-builtins/Cargo.toml
 
   lock-file:
     name: Lock file
diff --git a/Cargo.toml b/Cargo.toml
index aa5818308c..4fb3516212 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,7 +156,12 @@ tcp = ["net", "smoltcp", "smoltcp/socket-tcp"]
 udp = ["net", "smoltcp", "smoltcp/socket-udp"]
 
 ## Enables DHCPv4 support.
-dhcpv4 = ["net", "smoltcp", "smoltcp/proto-dhcpv4", "smoltcp/socket-dhcpv4"]
+dhcpv4 = [
+	"net",
+	"smoltcp",
+	"smoltcp/proto-dhcpv4",
+	"smoltcp/socket-dhcpv4",
+]
 
 ## Enables DNS support.
 dns = ["net", "smoltcp", "smoltcp/socket-dns"]
@@ -280,7 +285,7 @@ vsock = ["virtio-vsock"]
 
 [lints.rust]
 rust_2018_idioms = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(careful)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(careful)"] }
 unsafe_op_in_unsafe_fn = "warn"
 
 [lints.clippy]
@@ -369,8 +374,8 @@ raw-cpuid = "11"
 uart_16550 = "0.4"
 x86_64 = "0.15"
 memory_addresses = { version = "0.3", default-features = false, features = [
-	"x86_64",
-	"conv-x86_64",
+		"x86_64",
+		"conv-x86_64",
 ] }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
@@ -379,7 +384,7 @@ arm-gic = { version = "0.6" }
 arm-pl011-uart = { version = "0.4", default-features = false }
 semihosting = { version = "0.1", optional = true }
 memory_addresses = { version = "0.3", default-features = false, features = [
-	"aarch64",
+		"aarch64",
 ] }
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]
@@ -389,7 +394,7 @@ semihosting = { version = "0.1", optional = true }
 tock-registers = { version = "0.10", optional = true }
 trapframe = "0.10"
 memory_addresses = { version = "0.3", default-features = false, features = [
-	"riscv64",
+		"riscv64",
 ] }
 
 [dev-dependencies]
@@ -402,13 +407,8 @@ built = { version = "0.8", features = ["git2", "chrono"] }
 llvm-tools = "0.1"
 
 [workspace]
-members = [
-	"hermit-macro",
-	"xtask",
-]
-exclude = [
-	"hermit-builtins",
-]
+members = ["hermit-macro", "xtask"]
+exclude = ["hermit-builtins"]
 
 [patch.crates-io]
 safe-mmio = { git = "https://github.com/hermit-os/safe-mmio", branch = "be" }
diff --git a/hermit-macro/Cargo.toml b/hermit-macro/Cargo.toml
index e4eb246881..0bef6830ff 100644
--- a/hermit-macro/Cargo.toml
+++ b/hermit-macro/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "hermit-macro"
 version = "0.1.0"
-authors = ["Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>"]
+authors = [
+	"Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>",
+]
 edition = "2024"
 description = "Proc macro implementation to defined system calls"
 repository = "https://github.com/hermit-os/kernel"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 7ed62e29e8..a97f114a3d 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -5,7 +5,14 @@ edition = "2024"
 
 [features]
 default = ["ci"]
-ci = ["dep:libc", "dep:ovmf-prebuilt", "dep:sysinfo", "dep:ureq", "dep:vsock", "dep:wait-timeout"]
+ci = [
+	"dep:libc",
+	"dep:ovmf-prebuilt",
+	"dep:sysinfo",
+	"dep:ureq",
+	"dep:vsock",
+	"dep:wait-timeout",
+]
 
 [dependencies]
 anyhow = "1.0"