diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b8c8e6de..4dc36a15d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,13 +18,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
+      - run: rustup component add rustfmt && rustup component add clippy
+      - run: cargo fmt --all --check
+        # TODO: Remove this once formatting and clippy lints have been applied
+        #       for now it's useful to see the feedback frmo fmt as well as build failures
+        continue-on-error: true
+      - run: cargo clippy --all-targets --all-features
+        env:
+          RUSTFLAGS: -Dwarnings
+        # TODO: Remove this once formatting and clippy lints have been applied
+        #       for now it's useful to see the feedback frmo fmt as well as build failures
+        continue-on-error: true
       - run: cargo build --all-targets --all-features --verbose
       - run: cargo test --all-targets --all-features --verbose
       - run: cargo test --doc --all-features --verbose
-      - run: cargo clippy --all-targets --all-features --verbose
-        env:
-          RUSTFLAGS: -Dwarnings
-      - run: cargo fmt --all --check
       - run: cargo doc --workspace --all-features --no-deps --document-private-items
         env:
           RUSTDOCFLAGS: "--cfg doc_cfg -D warnings"
diff --git a/merkle-hash-bench/Cargo.toml b/merkle-hash-bench/Cargo.toml
index a5ee5dd2f..0c0334f5a 100644
--- a/merkle-hash-bench/Cargo.toml
+++ b/merkle-hash-bench/Cargo.toml
@@ -6,21 +6,21 @@ edition = "2021"
 [features]
 default = ["plonky3", "zkhash"]
 plonky3 = [
-    "dep:p3-bn254-fr",
-    "dep:p3-goldilocks",
-    "dep:p3-mersenne-31",
-    "dep:p3-field",
-    "dep:p3-poseidon2",
-    "dep:p3-symmetric",
-    "dep:p3-monolith",
-    "dep:p3-rescue",
+  "dep:p3-bn254-fr",
+  "dep:p3-goldilocks",
+  "dep:p3-mersenne-31",
+  "dep:p3-field",
+  "dep:p3-poseidon2",
+  "dep:p3-symmetric",
+  "dep:p3-monolith",
+  "dep:p3-rescue",
 ]
 icicle = [
-    "dep:icicle-core",
-    "dep:icicle-runtime",
-    "dep:icicle-hash",
-    "dep:icicle-bn254",
-    "dep:icicle-m31",
+  "dep:icicle-core",
+  "dep:icicle-runtime",
+  "dep:icicle-hash",
+  "dep:icicle-bn254",
+  "dep:icicle-m31",
 ]
 zkhash = ["dep:zkhash"]
 stwo = ["dep:stwo-prover"]
@@ -49,7 +49,7 @@ gensym = "0.1.1"
 
 # Plonky 3
 p3-bn254-fr = { git = "https://github.com/Plonky3/Plonky3.git", branch = "main", optional = true, features = [
-    "table",
+  "table",
 ] }
 p3-goldilocks = { git = "https://github.com/Plonky3/Plonky3.git", branch = "main", optional = true }
 p3-mersenne-31 = { git = "https://github.com/Plonky3/Plonky3.git", branch = "main", optional = true }
@@ -67,7 +67,7 @@ icicle-bn254 = { git = "https://github.com/ingonyama-zk/icicle.git", branch = "m
 icicle-m31 = { git = "https://github.com/ingonyama-zk/icicle.git", branch = "main", optional = true }
 
 # ZKHash
-zkhash = { git = "https://extgit.isec.tugraz.at/krypto/zkfriendlyhashzoo.git", commit = "f252d2b2767bc88659615601ac13e19f52c2c11f", optional = true }
+zkhash = { git = "https://extgit.isec.tugraz.at/krypto/zkfriendlyhashzoo.git", rev = "f252d2b2767bc88659615601ac13e19f52c2c11f", optional = true }
 
 # Stwo
 stwo-prover = { git = "https://github.com/starkware-libs/stwo.git", version = "0.1.1", optional = true }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..5d56faf9a
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly"