diff --git a/Cargo.toml b/Cargo.toml
index a0a0f09f8..72dfd4dbe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -149,6 +149,6 @@ ark-serialize = "0.5"
 ark-std = { version = "0.5", features = ["std"] }
 spongefish = { git = "https://github.com/arkworks-rs/spongefish", features = [
   "arkworks-algebra",
-] }
-spongefish-pow = { git = "https://github.com/arkworks-rs/spongefish" }
-whir = { git = "https://github.com/WizardOfMenlo/whir/", features = ["tracing"], rev = "3d627d31cec7d73a470a31a913229dd3128ee0cf" }
+], rev = "ecb4f08373ed930175585c856517efdb1851fb47" }
+spongefish-pow = { git = "https://github.com/arkworks-rs/spongefish", rev = "ecb4f08373ed930175585c856517efdb1851fb47" }
+whir = { git = "https://github.com/WizardOfMenlo/whir/", features = ["tracing"], rev = "15cf6668e904ed2e80c9e6209dcce69f5bcf79b9" }
\ No newline at end of file
diff --git a/provekit/r1cs-compiler/src/whir_r1cs.rs b/provekit/r1cs-compiler/src/whir_r1cs.rs
index e08ac26f2..a28110954 100644
--- a/provekit/r1cs-compiler/src/whir_r1cs.rs
+++ b/provekit/r1cs-compiler/src/whir_r1cs.rs
@@ -1,8 +1,12 @@
 use {
-    provekit_common::{utils::next_power_of_two, FieldElement, WhirConfig, WhirR1CSScheme, R1CS},
-    whir::parameters::{
-        default_max_pow, DeduplicationStrategy, FoldingFactor, MerkleProofStrategy,
-        MultivariateParameters, ProtocolParameters, SoundnessType,
+    provekit_common::{utils::next_power_of_two, WhirConfig, WhirR1CSScheme, R1CS},
+    std::sync::Arc,
+    whir::{
+        ntt::RSDefault,
+        parameters::{
+            default_max_pow, DeduplicationStrategy, FoldingFactor, MerkleProofStrategy,
+            MultivariateParameters, ProtocolParameters, SoundnessType,
+        },
     },
 };
 
@@ -63,6 +67,8 @@ impl WhirR1CSSchemeBuilder for WhirR1CSScheme {
             deduplication_strategy: DeduplicationStrategy::Disabled,
             merkle_proof_strategy: MerkleProofStrategy::Uncompressed,
         };
-        WhirConfig::new(mv_params, whir_params)
+        let reed_solomon = Arc::new(RSDefault);
+        let basefield_reed_solomon = reed_solomon.clone();
+        WhirConfig::new(reed_solomon, basefield_reed_solomon, mv_params, whir_params)
     }
 }