diff --git a/prover/crates/lib/keystore/src/keystore.rs b/prover/crates/lib/keystore/src/keystore.rs
index eec7b4c8344e..f69e371cac48 100644
--- a/prover/crates/lib/keystore/src/keystore.rs
+++ b/prover/crates/lib/keystore/src/keystore.rs
@@ -132,12 +132,12 @@ impl Keystore {
             ProverServiceDataType::FinalizationHints => self
                 .basedir
                 .join(format!("finalization_hints_{}.bin", name)),
-            ProverServiceDataType::PlonkSetupData => {
-                self.basedir.join(format!("plonk_setup_{}_data.bin", name))
-            }
-            ProverServiceDataType::FflonkSetupData => {
-                self.basedir.join(format!("fflonk_setup_{}_data.bin", name))
-            }
+            ProverServiceDataType::PlonkSetupData => self
+                .setup_data_path
+                .join(format!("plonk_setup_{}_data.bin", name)),
+            ProverServiceDataType::FflonkSetupData => self
+                .setup_data_path
+                .join(format!("fflonk_setup_{}_data.bin", name)),
             ProverServiceDataType::SnarkVerificationKey => {
                 self.basedir.join(format!("verification_{}_key.json", name))
             }