diff --git a/crates/multithread/src/multithread.rs b/crates/multithread/src/multithread.rs
index 45094b4e1a..74f15c7de4 100644
--- a/crates/multithread/src/multithread.rs
+++ b/crates/multithread/src/multithread.rs
@@ -174,7 +174,11 @@ async fn handle_compute_request_event(
 
     match result {
         Ok(val) => bus.publish(val)?,
-        Err(e) => bus.err(EType::Computation, e),
+        Err(e) => {
+            // Publish ComputeRequestError so ProofRequestActor can handle it
+            // and continue without proof if needed
+            bus.publish(e)?
+        }
     };
     Ok(())
 }
diff --git a/crates/zk-prover/src/actors/proof_request.rs b/crates/zk-prover/src/actors/proof_request.rs
index 643dfc0162..9896f5297a 100644
--- a/crates/zk-prover/src/actors/proof_request.rs
+++ b/crates/zk-prover/src/actors/proof_request.rs
@@ -118,7 +118,7 @@ impl ProofRequestActor {
             warn!("ZK proof request failed for E3 {}: {err}", pending.e3_id);
 
             // Publish EncryptionKeyCreated without proof to allow the system to continue
-            // Applications can check the has_proof field to determine if validation is required
+            // Applications can check the proof field to determine if validation occurred
             if let Err(err) = self.bus.publish(EncryptionKeyCreated {
                 e3_id: pending.e3_id,
                 key: pending.key,
diff --git a/crates/zk-prover/src/config.rs b/crates/zk-prover/src/config.rs
index c385cbad25..ef873953d9 100644
--- a/crates/zk-prover/src/config.rs
+++ b/crates/zk-prover/src/config.rs
@@ -13,9 +13,8 @@ use std::time::Duration;
 use tokio::fs;
 use tracing::{debug, warn};
 
-// TODO: change to main when feat/noir-prover is merged
 const VERSIONS_MANIFEST_URL: &str =
-    "https://raw.githubusercontent.com/gnosisguild/enclave/feat/noir-prover/crates/zk-prover/versions.json";
+    "https://raw.githubusercontent.com/gnosisguild/enclave/main/crates/zk-prover/versions.json";
 
 const BB_VERSION: &str = "3.0.0-nightly.20251104";
 const CIRCUITS_VERSION: &str = "0.1.11";