diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
index 12c8b1b..28f575c 100644
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -234,9 +234,15 @@ impl Platform for ReviveDevNodePolkavmResolcPlatform {
             .path
             .as_path();
         let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet();
+        let working_directory = AsRef::<WorkingDirectoryConfiguration>::as_ref(&context).as_path();
         let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND;
 
-        SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet)
+        SubstrateNode::node_genesis(
+            revive_dev_node_path,
+            export_chainspec_command,
+            &wallet,
+            working_directory,
+        )
     }
 }
 
@@ -302,9 +308,15 @@ impl Platform for ReviveDevNodeRevmSolcPlatform {
             .path
             .as_path();
         let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet();
+        let working_directory = AsRef::<WorkingDirectoryConfiguration>::as_ref(&context).as_path();
         let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND;
 
-        SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet)
+        SubstrateNode::node_genesis(
+            revive_dev_node_path,
+            export_chainspec_command,
+            &wallet,
+            working_directory,
+        )
     }
 }
 
diff --git a/crates/node/src/node_implementations/substrate.rs b/crates/node/src/node_implementations/substrate.rs
index 787e6a5..278819a 100644
--- a/crates/node/src/node_implementations/substrate.rs
+++ b/crates/node/src/node_implementations/substrate.rs
@@ -160,6 +160,7 @@ impl SubstrateNode {
             &self.node_binary,
             &self.export_chainspec_command,
             &self.wallet,
+            self.base_directory.as_path(),
         )
         .context("Failed to prepare the chainspec command")?;
 
@@ -319,6 +320,7 @@ impl SubstrateNode {
         node_path: &Path,
         export_chainspec_command: &str,
         wallet: &EthereumWallet,
+        base_directory: impl AsRef<Path>,
     ) -> anyhow::Result<serde_json::Value> {
         trace!("Exporting the chainspec");
         let output = Command::new(node_path)
@@ -326,6 +328,7 @@ impl SubstrateNode {
             .arg("--chain")
             .arg("dev")
             .env_remove("RUST_LOG")
+            .current_dir(base_directory)
             .output()
             .context("Failed to export the chain-spec")?;
 
diff --git a/polkadot-sdk b/polkadot-sdk
index a44be63..6ffecaa 160000
--- a/polkadot-sdk
+++ b/polkadot-sdk
@@ -1 +1 @@
-Subproject commit a44be635e6710432c49e844af8631e6ad98ade36
+Subproject commit 6ffecaaab2a3039b8055da047a432fa1ad3c8b25
diff --git a/resolc-compiler-tests b/resolc-compiler-tests
index d06c4d0..bb3b0c1 160000
--- a/resolc-compiler-tests
+++ b/resolc-compiler-tests
@@ -1 +1 @@
-Subproject commit d06c4d012741c94b37c3b8f77be046c9b71b4ce8
+Subproject commit bb3b0c131982440437de0f0d748eaf37f765ef93