diff --git a/Cargo.lock b/Cargo.lock
index 9a459437..fe22548f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -496,9 +496,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 dependencies = [
  "serde",
 ]
@@ -4079,8 +4079,8 @@ dependencies = [
 
 [[package]]
 name = "relayer-utils"
-version = "0.4.0"
-source = "git+https://github.com/zkemail/relayer-utils.git#aa1ab831ba7c3dbd60ac1bf2047509246a73ea26"
+version = "0.4.1"
+source = "git+https://github.com/zkemail/relayer-utils.git?branch=fix%2Fclave-depl#d952b605904addf55140ad36c04b721315d515cd"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -4579,9 +4579,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.211"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "1ac55e59090389fb9f0dd9e0f3c09615afed1d19094284d0b200441f13550793"
 dependencies = [
  "serde_derive",
 ]
@@ -4618,9 +4618,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.211"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "54be4f245ce16bc58d57ef2716271d0d4519e0f6defa147f6e081005bcb278ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5422,9 +5422,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6470,7 +6470,7 @@ dependencies = [
 [[package]]
 name = "zk-regex-apis"
 version = "2.2.0"
-source = "git+https://github.com/zkemail/zk-regex.git#81d0299ed2b405c72138125385ea7f6bb6a680b2"
+source = "git+https://github.com/zkemail/zk-regex.git#3319327ef3599989071ab2ea3cb9340a2c48b354"
 dependencies = [
  "fancy-regex",
  "itertools 0.13.0",
diff --git a/packages/relayer/Cargo.toml b/packages/relayer/Cargo.toml
index 96a8eeda..f465886a 100644
--- a/packages/relayer/Cargo.toml
+++ b/packages/relayer/Cargo.toml
@@ -24,7 +24,7 @@ serde_json = "1.0.68"
 tiny_http = "0.12.0"
 lettre = { version = "0.10.4", features = ["tokio1", "tokio1-native-tls"] }
 ethers = { version = "2.0.10", features = ["abigen"] }
-relayer-utils = { version = "0.4.0", git = "https://github.com/zkemail/relayer-utils.git" }
+relayer-utils = { git = "https://github.com/zkemail/relayer-utils.git", branch = "fix/clave-depl" }
 futures = "0.3.28"
 sqlx = { version = "=0.7.3", features = ["postgres", "runtime-tokio"] }
 regex = "1.10.2"
diff --git a/packages/relayer/src/core.rs b/packages/relayer/src/core.rs
index a06a6324..4972284a 100644
--- a/packages/relayer/src/core.rs
+++ b/packages/relayer/src/core.rs
@@ -47,7 +47,7 @@ pub async fn handle_email(email: String) -> Result<EmailAuthEvent, EmailError> {
     })?;
     let request_decomposed_def = serde_json::from_str(&request_def_contents)
         .map_err(|e| EmailError::Parse(format!("Failed to parse request_def.json: {}", e)))?;
-    let request_idxes = extract_substr_idxes(&email, &request_decomposed_def)?;
+    let request_idxes = extract_substr_idxes(&email, &request_decomposed_def, false)?;
     if request_idxes.is_empty() {
         return Err(EmailError::Body(WRONG_COMMAND_FORMAT.to_string()));
     }
diff --git a/packages/relayer/src/modules/dkim.rs b/packages/relayer/src/modules/dkim.rs
index 369f063b..848d9e15 100644
--- a/packages/relayer/src/modules/dkim.rs
+++ b/packages/relayer/src/modules/dkim.rs
@@ -191,8 +191,11 @@ pub async fn check_and_update_dkim(
             )
         })?;
     let selector = {
-        let idxes =
-            extract_substr_idxes(&parsed_email.canonicalized_header, &selector_decomposed_def)?[0];
+        let idxes = extract_substr_idxes(
+            &parsed_email.canonicalized_header,
+            &selector_decomposed_def,
+            false,
+        )?[0];
         parsed_email.canonicalized_header[idxes.0..idxes.1].to_string()
     };