diff --git a/crates/orchestrator/src/network_spec/parachain.rs b/crates/orchestrator/src/network_spec/parachain.rs
index 7c6ec533e3f13dbef553ca4cc8e866254b04ce32..730e9e0b4e5021d1dc3efed6b9a14fb1c188c2df 100644
--- a/crates/orchestrator/src/network_spec/parachain.rs
+++ b/crates/orchestrator/src/network_spec/parachain.rs
@@ -108,27 +108,24 @@ impl ParachainSpec {
             };
             let chain_spec_builder = chain_spec_builder.set_chain_name(chain_name);
 
+            let replacements = HashMap::from([
+                ("disableBootnodes", "--disable-default-bootnode"),
+                ("mainCommand", main_cmd.as_str()),
+            ]);
+            let tmpl = if let Some(tmpl) = config.chain_spec_command() {
+                apply_replacements(tmpl, &replacements)
+            } else {
+                apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
+            };
+
+            let chain_spec = chain_spec_builder
+                .command(tmpl.as_str(), config.chain_spec_command_is_local())
+                .image(main_image.clone());
+
             if let Some(chain_spec_path) = config.chain_spec_path() {
-                Some(chain_spec_builder.asset_location(chain_spec_path.clone()))
+                Some(chain_spec.asset_location(chain_spec_path.clone()))
             } else {
-                // TODO: Do we need to add the posibility to set the command to use?
-                // Currently (v1) is possible but when is set is set to the default command.
-
-                let replacements = HashMap::from([
-                    ("disableBootnodes", "--disable-default-bootnode"),
-                    ("mainCommand", main_cmd.as_str()),
-                ]);
-                let tmpl = if let Some(tmpl) = config.chain_spec_command() {
-                    apply_replacements(tmpl, &replacements)
-                } else {
-                    apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
-                };
-
-                Some(
-                    chain_spec_builder
-                        .command(tmpl.as_str(), config.chain_spec_command_is_local())
-                        .image(main_image.clone()),
-                )
+                Some(chain_spec)
             }
         } else {
             None
diff --git a/crates/orchestrator/src/network_spec/relaychain.rs b/crates/orchestrator/src/network_spec/relaychain.rs
index 78d883b2b62fa64684406298fff9dd5affc8fadb..a83524437a37014bdf2a48e7df2ae5effc3b4376 100644
--- a/crates/orchestrator/src/network_spec/relaychain.rs
+++ b/crates/orchestrator/src/network_spec/relaychain.rs
@@ -73,24 +73,26 @@ impl RelaychainSpec {
             .or(config.nodes().first().and_then(|node| node.image()))
             .map(|image| image.as_str().to_string());
 
+        let replacements = HashMap::from([
+            ("disableBootnodes", "--disable-default-bootnode"),
+            ("mainCommand", main_cmd.as_str()),
+        ]);
+        let tmpl = if let Some(tmpl) = config.chain_spec_command() {
+            apply_replacements(tmpl, &replacements)
+        } else {
+            apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
+        };
+
         let chain_spec = ChainSpec::new(config.chain().as_str(), Context::Relay)
-            .set_chain_name(config.chain().as_str());
+            .set_chain_name(config.chain().as_str())
+            .command(tmpl.as_str(), config.chain_spec_command_is_local())
+            .image(main_image.clone());
+
+        // Add asset location if present
         let chain_spec = if let Some(chain_spec_path) = config.chain_spec_path() {
             chain_spec.asset_location(chain_spec_path.clone())
         } else {
-            let replacements = HashMap::from([
-                ("disableBootnodes", "--disable-default-bootnode"),
-                ("mainCommand", main_cmd.as_str()),
-            ]);
-            let tmpl = if let Some(tmpl) = config.chain_spec_command() {
-                apply_replacements(tmpl, &replacements)
-            } else {
-                apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
-            };
-
             chain_spec
-                .command(tmpl.as_str(), config.chain_spec_command_is_local())
-                .image(main_image.clone())
         };
 
         // build the `node_specs`