diff --git a/crates/cdk-signatory/build.rs b/crates/cdk-signatory/build.rs
index 7cba4c69..16a800e6 100644
--- a/crates/cdk-signatory/build.rs
+++ b/crates/cdk-signatory/build.rs
@@ -2,5 +2,10 @@ fn main() {
     println!("cargo:rerun-if-changed=src/proto/signatory.proto");
 
     #[cfg(feature = "grpc")]
-    tonic_build::compile_protos("proto/signatory.proto").unwrap();
+    tonic_build::configure()
+        .protoc_arg("--experimental_allow_proto3_optional")
+        .type_attribute(".", "#[allow(missing_docs)]")
+        .field_attribute(".", "#[allow(missing_docs)]")
+        .compile_protos(&["src/proto/signatory.proto"], &["src/proto"])
+        .unwrap();
 }
diff --git a/crates/cdk-signatory/proto/signatory.proto b/crates/cdk-signatory/src/proto/signatory.proto
similarity index 100%
rename from crates/cdk-signatory/proto/signatory.proto
rename to crates/cdk-signatory/src/proto/signatory.proto
diff --git a/crates/cdk/Cargo.toml b/crates/cdk/Cargo.toml
index e7daf1a8..6541003f 100644
--- a/crates/cdk/Cargo.toml
+++ b/crates/cdk/Cargo.toml
@@ -13,7 +13,7 @@ license.workspace = true
 [features]
 default = ["mint", "wallet", "auth"]
 wallet = ["dep:reqwest", "cdk-common/wallet"]
-mint = ["dep:futures", "dep:reqwest", "cdk-common/mint"]
+mint = ["dep:futures", "dep:reqwest", "cdk-common/mint", "cdk-signatory"]
 auth = ["dep:jsonwebtoken", "cdk-common/auth", "cdk-common/auth"]
 # We do not commit to a MSRV with swagger enabled
 swagger = ["mint", "dep:utoipa", "cdk-common/swagger"]
@@ -55,7 +55,7 @@ tokio = { workspace = true, features = [
     "sync",
 ] }
 getrandom = { version = "0.2" }
-cdk-signatory = { workspace = true, features = ["grpc"] }
+cdk-signatory = { workspace = true, features = ["grpc"], optional = true }
 tokio-tungstenite = { workspace = true, features = [
     "rustls",
     "rustls-tls-native-roots",