diff --git a/core/node/eth_watch/src/tests.rs b/core/node/eth_watch/src/tests.rs
index 8c37b5c9920b..feb9eff35b5c 100644
--- a/core/node/eth_watch/src/tests.rs
+++ b/core/node/eth_watch/src/tests.rs
@@ -152,7 +152,7 @@ impl EthClient for MockEthClient {
         Ok(logs
             .into_iter()
             .filter(|log| {
-                log.topics.get(0) == Some(&topic1)
+                log.topics.first() == Some(&topic1)
                     && (topic2.is_none() || log.topics.get(1) == topic2.as_ref())
             })
             .collect())
diff --git a/zk_toolbox/crates/config/src/ecosystem.rs b/zk_toolbox/crates/config/src/ecosystem.rs
index 7ff65d4612df..7e7c5d4dae52 100644
--- a/zk_toolbox/crates/config/src/ecosystem.rs
+++ b/zk_toolbox/crates/config/src/ecosystem.rs
@@ -151,6 +151,10 @@ impl EcosystemConfig {
         self.load_chain_inner(&name)
     }
 
+    pub fn load_current_chain(&self) -> Option<ChainConfig> {
+        self.load_chain_inner(self.current_chain())
+    }
+
     fn load_chain_inner(&self, name: &str) -> Option<ChainConfig> {
         let path = self.chains.join(name).join(CONFIG_NAME);
         let config = ChainConfigInternal::read(self.get_shell(), path.clone()).ok()?;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/build_transactions.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/build_transactions.rs
index 68cb7a9a0742..98b2e226cc13 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/chain/build_transactions.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/build_transactions.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use common::{config::global_config, git, logger, spinner::Spinner};
+use common::{git, logger, spinner::Spinner};
 use config::{
     copy_configs, traits::SaveConfigWithBasePath, update_from_chain_config, EcosystemConfig,
 };
@@ -27,9 +27,8 @@ const SCRIPT_CONFIG_FILE_DST: &str = "register-hyperchain.toml";
 
 pub(crate) async fn run(args: BuildTransactionsArgs, shell: &Shell) -> anyhow::Result<()> {
     let config = EcosystemConfig::from_file(shell)?;
-    let chain_name = global_config().chain_name.clone();
     let chain_config = config
-        .load_chain(chain_name)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
 
     let args = args.fill_values_with_prompt(config.default_chain.clone());
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_l2_contracts.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_l2_contracts.rs
index 5bfc0a623488..26a1d0bb3251 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_l2_contracts.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_l2_contracts.rs
@@ -3,7 +3,6 @@ use std::path::Path;
 use anyhow::Context;
 use common::{
     cmd::Cmd,
-    config::global_config,
     forge::{Forge, ForgeScriptArgs},
     spinner::Spinner,
 };
@@ -43,10 +42,9 @@ pub async fn run(
     shell: &Shell,
     deploy_option: Deploy2ContractsOption,
 ) -> anyhow::Result<()> {
-    let chain_name = global_config().chain_name.clone();
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(chain_name)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
 
     let mut contracts = chain_config.get_contracts_config()?;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_paymaster.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_paymaster.rs
index 58c199189bd7..0da56f0c962d 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_paymaster.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_paymaster.rs
@@ -1,8 +1,5 @@
 use anyhow::Context;
-use common::{
-    config::global_config,
-    forge::{Forge, ForgeScriptArgs},
-};
+use common::forge::{Forge, ForgeScriptArgs};
 use config::{
     forge_interface::{
         paymaster::{DeployPaymasterInput, DeployPaymasterOutput},
@@ -19,10 +16,9 @@ use crate::{
 };
 
 pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
-    let chain_name = global_config().chain_name.clone();
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(chain_name)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
     let mut contracts = chain_config.get_contracts_config()?;
     deploy_paymaster(shell, &chain_config, &mut contracts, args, None, true).await?;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/genesis.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/genesis.rs
index 187af41489d9..c72183e98b77 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/chain/genesis.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/genesis.rs
@@ -37,10 +37,9 @@ use crate::{
 };
 
 pub async fn run(args: GenesisArgs, shell: &Shell) -> anyhow::Result<()> {
-    let chain_name = global_config().chain_name.clone();
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(chain_name)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
     let args = args.fill_values_with_prompt(&chain_config);
 
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/init.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/init.rs
index 685e6165d258..4d7096723da2 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/chain/init.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/init.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use common::{config::global_config, git, logger, spinner::Spinner};
+use common::{git, logger, spinner::Spinner};
 use config::{
     copy_configs, set_l1_rpc_url, traits::SaveConfigWithBasePath, update_from_chain_config,
     ChainConfig, EcosystemConfig, DEFAULT_CONSENSUS_PORT,
@@ -34,10 +34,9 @@ use crate::{
 };
 
 pub(crate) async fn run(args: InitArgs, shell: &Shell) -> anyhow::Result<()> {
-    let chain_name = global_config().chain_name.clone();
     let config = EcosystemConfig::from_file(shell)?;
     let chain_config = config
-        .load_chain(chain_name)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
     let mut args = args.fill_values_with_prompt(&chain_config);
 
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/set_token_multiplier_setter.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/set_token_multiplier_setter.rs
index 15f7de4c277c..475725cd14ef 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/chain/set_token_multiplier_setter.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/set_token_multiplier_setter.rs
@@ -1,6 +1,5 @@
 use anyhow::Context;
 use common::{
-    config::global_config,
     forge::{Forge, ForgeScript, ForgeScriptArgs},
     logger,
     spinner::Spinner,
@@ -30,10 +29,9 @@ lazy_static! {
 }
 
 pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
-    let chain_name = global_config().chain_name.clone();
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(chain_name)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
     let contracts_config = chain_config.get_contracts_config()?;
     let l1_url = chain_config
diff --git a/zk_toolbox/crates/zk_inception/src/commands/consensus.rs b/zk_toolbox/crates/zk_inception/src/commands/consensus.rs
index 6cc63b0bafa4..7cf96ebe5ad5 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/consensus.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/consensus.rs
@@ -3,7 +3,7 @@ use std::{borrow::Borrow, collections::HashMap, sync::Arc};
 /// Consensus registry contract operations.
 /// Includes code duplicated from `zksync_node_consensus::registry::abi`.
 use anyhow::Context as _;
-use common::{config::global_config, logger};
+use common::logger;
 use config::EcosystemConfig;
 use ethers::{
     abi::Detokenize,
@@ -174,9 +174,8 @@ impl Setup {
 
     fn new(shell: &Shell) -> anyhow::Result<Self> {
         let ecosystem_config = EcosystemConfig::from_file(shell)?;
-        let chain_name = global_config().chain_name.clone();
         let chain = ecosystem_config
-            .load_chain(chain_name)
+            .load_current_chain()
             .context(messages::MSG_CHAIN_NOT_INITIALIZED)?;
         let contracts = chain
             .get_contracts_config()
diff --git a/zk_toolbox/crates/zk_inception/src/commands/contract_verifier/run.rs b/zk_toolbox/crates/zk_inception/src/commands/contract_verifier/run.rs
index 32049aa0a902..9913ec817e90 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/contract_verifier/run.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/contract_verifier/run.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use common::{cmd::Cmd, config::global_config, logger};
+use common::{cmd::Cmd, logger};
 use config::EcosystemConfig;
 use xshell::{cmd, Shell};
 
@@ -10,7 +10,7 @@ use crate::messages::{
 pub(crate) async fn run(shell: &Shell) -> anyhow::Result<()> {
     let ecosystem = EcosystemConfig::from_file(shell)?;
     let chain = ecosystem
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
 
     let config_path = chain.path_to_general_config();
diff --git a/zk_toolbox/crates/zk_inception/src/commands/explorer/backend.rs b/zk_toolbox/crates/zk_inception/src/commands/explorer/backend.rs
index 6fdd3faa9807..29cc2ecfbff0 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/explorer/backend.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/explorer/backend.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use anyhow::Context;
-use common::{config::global_config, docker};
+use common::docker;
 use config::{explorer_compose::ExplorerBackendComposeConfig, EcosystemConfig};
 use xshell::Shell;
 
@@ -13,7 +13,7 @@ use crate::messages::{
 pub(crate) fn run(shell: &Shell) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
     let chain_name = chain_config.name.clone();
     // Read chain-level explorer backend docker compose file
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/init.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/init.rs
index 28c3e80aaab0..184151764961 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/external_node/init.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/init.rs
@@ -1,6 +1,5 @@
 use anyhow::Context;
 use common::{
-    config::global_config,
     db::{drop_db_if_exists, init_db, migrate_db, DatabaseConfig},
     spinner::Spinner,
 };
@@ -20,9 +19,8 @@ use crate::{
 pub async fn run(shell: &Shell) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
 
-    let chain = global_config().chain_name.clone();
     let chain_config = ecosystem_config
-        .load_chain(chain)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
 
     init(shell, &chain_config).await
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs
index bc741a6eb385..defbbd12d401 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs
@@ -1,7 +1,7 @@
 use std::{collections::BTreeMap, path::Path, str::FromStr};
 
 use anyhow::Context;
-use common::{config::global_config, logger};
+use common::logger;
 use config::{
     external_node::ENConfig,
     set_rocks_db_config,
@@ -34,10 +34,9 @@ use crate::{
 
 pub fn run(shell: &Shell, args: PrepareConfigArgs) -> anyhow::Result<()> {
     logger::info(MSG_PREPARING_EN_CONFIGS);
-    let chain_name = global_config().chain_name.clone();
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let mut chain_config = ecosystem_config
-        .load_chain(chain_name)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
 
     let args = args.fill_values_with_prompt(&chain_config);
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/run.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/run.rs
index 46328699e6d4..46c98119f893 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/external_node/run.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/run.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use common::{config::global_config, logger};
+use common::logger;
 use config::{ChainConfig, EcosystemConfig};
 use xshell::Shell;
 
@@ -12,9 +12,8 @@ use crate::{
 pub async fn run(shell: &Shell, args: RunExternalNodeArgs) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
 
-    let chain = global_config().chain_name.clone();
     let chain_config = ecosystem_config
-        .load_chain(chain)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
 
     logger::info(MSG_STARTING_EN);
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/compressor_keys.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/compressor_keys.rs
index fd83fccfebfa..703ecc18c4cb 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/prover/compressor_keys.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/compressor_keys.rs
@@ -1,7 +1,5 @@
 use anyhow::Context;
-use common::{
-    check_prerequisites, cmd::Cmd, config::global_config, spinner::Spinner, WGET_PREREQUISITE,
-};
+use common::{check_prerequisites, cmd::Cmd, spinner::Spinner, WGET_PREREQUISITE};
 use config::{get_link_to_prover, EcosystemConfig, GeneralConfig};
 use xshell::{cmd, Shell};
 
@@ -14,7 +12,7 @@ use crate::messages::{
 pub(crate) async fn run(shell: &Shell, args: CompressorKeysArgs) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
     let mut general_config = chain_config.get_general_config()?;
 
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/init.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/init.rs
index 20e682745870..ad92180aea9b 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/prover/init.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/init.rs
@@ -39,7 +39,7 @@ pub(crate) async fn run(args: ProverInitArgs, shell: &Shell) -> anyhow::Result<(
     let default_compressor_key_path = get_default_compressor_keys_path(&ecosystem_config)?;
 
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
     let args = args.fill_values_with_prompt(shell, &default_compressor_key_path, &chain_config)?;
 
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/run.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/run.rs
index 5f4bf2f4a671..a2fbafa99e05 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/prover/run.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/run.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::{anyhow, Context};
-use common::{check_prerequisites, cmd::Cmd, config::global_config, logger, GPU_PREREQUISITES};
+use common::{check_prerequisites, cmd::Cmd, logger, GPU_PREREQUISITES};
 use config::{get_link_to_prover, ChainConfig, EcosystemConfig};
 use xshell::{cmd, Shell};
 
@@ -19,7 +19,7 @@ pub(crate) async fn run(args: ProverRunArgs, shell: &Shell) -> anyhow::Result<()
     let args = args.fill_values_with_prompt()?;
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .expect(MSG_CHAIN_NOT_FOUND_ERR);
 
     let link_to_prover = get_link_to_prover(&ecosystem_config);
diff --git a/zk_toolbox/crates/zk_inception/src/commands/server.rs b/zk_toolbox/crates/zk_inception/src/commands/server.rs
index f96bc3aeebc9..be7a676a8252 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/server.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/server.rs
@@ -1,6 +1,5 @@
 use anyhow::Context;
 use common::{
-    config::global_config,
     logger,
     server::{Server, ServerMode},
 };
@@ -18,9 +17,8 @@ use crate::{
 pub fn run(shell: &Shell, args: RunServerArgs) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
 
-    let chain = global_config().chain_name.clone();
     let chain_config = ecosystem_config
-        .load_chain(chain)
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
 
     logger::info(MSG_STARTING_SERVER);
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/config_writer.rs b/zk_toolbox/crates/zk_supervisor/src/commands/config_writer.rs
index 3adecb36d069..04e019936e17 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/config_writer.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/config_writer.rs
@@ -1,6 +1,6 @@
 use anyhow::Context;
 use clap::Parser;
-use common::{config::global_config, logger, Prompt};
+use common::{logger, Prompt};
 use config::{override_config, EcosystemConfig};
 use xshell::Shell;
 
@@ -26,7 +26,7 @@ pub fn run(shell: &Shell, args: ConfigWriterArgs) -> anyhow::Result<()> {
     let path = args.get_config_path().into();
     let ecosystem = EcosystemConfig::from_file(shell)?;
     let chain = ecosystem
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
     logger::step(msg_overriding_config(chain.name.clone()));
     override_config(shell, path, &chain)?;
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/prover/info.rs b/zk_toolbox/crates/zk_supervisor/src/commands/prover/info.rs
index 6a7d7ddeda8a..441edb2c4b2d 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/prover/info.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/prover/info.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use anyhow::Context as _;
-use common::{config::global_config, logger};
+use common::logger;
 use config::{ChainConfig, EcosystemConfig};
 use xshell::{cmd, Shell};
 
@@ -13,7 +13,7 @@ use crate::messages::MSG_CHAIN_NOT_FOUND_ERR;
 pub async fn run(shell: &Shell) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .expect(MSG_CHAIN_NOT_FOUND_ERR);
 
     let link_to_code = ecosystem_config.link_to_code;
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_batch.rs b/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_batch.rs
index b1c02c9a9fea..8c2cdd4d88dd 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_batch.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_batch.rs
@@ -1,6 +1,4 @@
-use common::{
-    check_prerequisites, cmd::Cmd, config::global_config, logger, PROVER_CLI_PREREQUISITE,
-};
+use common::{check_prerequisites, cmd::Cmd, logger, PROVER_CLI_PREREQUISITE};
 use config::{get_link_to_prover, EcosystemConfig};
 use xshell::{cmd, Shell};
 
@@ -17,7 +15,7 @@ pub async fn run(shell: &Shell, args: InsertBatchArgs) -> anyhow::Result<()> {
 
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .expect(MSG_CHAIN_NOT_FOUND_ERR);
 
     let version = info::get_protocol_version(shell, &get_link_to_prover(&ecosystem_config)).await?;
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_version.rs b/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_version.rs
index 16bbdf13df4f..3dd9b7e0a1b1 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_version.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/prover/insert_version.rs
@@ -1,6 +1,4 @@
-use common::{
-    check_prerequisites, cmd::Cmd, config::global_config, logger, PROVER_CLI_PREREQUISITE,
-};
+use common::{check_prerequisites, cmd::Cmd, logger, PROVER_CLI_PREREQUISITE};
 use config::{get_link_to_prover, EcosystemConfig};
 use xshell::{cmd, Shell};
 
@@ -17,7 +15,7 @@ pub async fn run(shell: &Shell, args: InsertVersionArgs) -> anyhow::Result<()> {
 
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .expect(MSG_CHAIN_NOT_FOUND_ERR);
 
     let version = info::get_protocol_version(shell, &get_link_to_prover(&ecosystem_config)).await?;
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/snapshot.rs b/zk_toolbox/crates/zk_supervisor/src/commands/snapshot.rs
index 4ec44579aaf5..608c56233348 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/snapshot.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/snapshot.rs
@@ -1,6 +1,6 @@
 use anyhow::Context;
 use clap::Subcommand;
-use common::{cmd::Cmd, config::global_config, logger};
+use common::{cmd::Cmd, logger};
 use config::EcosystemConfig;
 use xshell::{cmd, Shell};
 
@@ -24,7 +24,7 @@ pub(crate) async fn run(shell: &Shell, args: SnapshotCommands) -> anyhow::Result
 async fn create(shell: &Shell) -> anyhow::Result<()> {
     let ecosystem = EcosystemConfig::from_file(shell)?;
     let chain = ecosystem
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
 
     let config_path = chain.path_to_general_config();
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/fees.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/fees.rs
index 4e69c0efb971..e0b881a14dbb 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/test/fees.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/fees.rs
@@ -21,7 +21,7 @@ pub async fn run(shell: &Shell, args: FeesArgs) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     shell.change_dir(ecosystem_config.link_to_code.join(TS_INTEGRATION_PATH));
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .expect(MSG_CHAIN_NOT_FOUND_ERR);
 
     if !args.no_deps {
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs
index 562cf4f7b9b7..5107abf6a59b 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs
@@ -21,7 +21,7 @@ pub async fn run(shell: &Shell, args: IntegrationArgs) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
 
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
     shell.change_dir(ecosystem_config.link_to_code.join(TS_INTEGRATION_PATH));
 
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/loadtest.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/loadtest.rs
index 5a2a87871b58..ee307438ec97 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/test/loadtest.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/loadtest.rs
@@ -9,7 +9,7 @@ pub fn run(shell: &Shell) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
 
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
 
     let general_api = chain_config
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/recovery.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/recovery.rs
index c69a9826d56c..6a3e337d41e9 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/test/recovery.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/recovery.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::Context;
-use common::{cmd::Cmd, config::global_config, logger, server::Server, spinner::Spinner};
+use common::{cmd::Cmd, logger, server::Server, spinner::Spinner};
 use config::EcosystemConfig;
 use xshell::{cmd, Shell};
 
@@ -40,7 +40,7 @@ async fn run_test(
 ) -> anyhow::Result<()> {
     Spinner::new("Running test...").freeze();
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
 
     let cmd = if args.snapshot {
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/revert.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/revert.rs
index 97794efeb3e1..8b00e9d7f4d1 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/test/revert.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/revert.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::Context;
-use common::{cmd::Cmd, config::global_config, logger, spinner::Spinner};
+use common::{cmd::Cmd, logger, spinner::Spinner};
 use config::EcosystemConfig;
 use xshell::{cmd, Shell};
 
@@ -40,7 +40,7 @@ async fn run_test(
     Spinner::new(&msg_revert_tests_run(args.external_node)).freeze();
 
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context(MSG_CHAIN_NOT_FOUND_ERR)?;
 
     let wallets_path: PathBuf = ecosystem_config.link_to_code.join(TEST_WALLETS_PATH);
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/wallet.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/wallet.rs
index ff5179ab5fec..62f32b50d559 100644
--- a/zk_toolbox/crates/zk_supervisor/src/commands/test/wallet.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/wallet.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::Context;
-use common::{config::global_config, logger};
+use common::logger;
 use config::EcosystemConfig;
 use xshell::Shell;
 
@@ -16,7 +16,7 @@ pub fn run(shell: &Shell) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
 
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .context("Chain not found")?;
 
     let wallets_path: PathBuf = ecosystem_config.link_to_code.join(TEST_WALLETS_PATH);
diff --git a/zk_toolbox/crates/zk_supervisor/src/dals.rs b/zk_toolbox/crates/zk_supervisor/src/dals.rs
index f9c07585f6dd..962a848fe00c 100644
--- a/zk_toolbox/crates/zk_supervisor/src/dals.rs
+++ b/zk_toolbox/crates/zk_supervisor/src/dals.rs
@@ -1,5 +1,4 @@
 use anyhow::{anyhow, Context};
-use common::config::global_config;
 use config::{EcosystemConfig, SecretsConfig};
 use url::Url;
 use xshell::Shell;
@@ -91,7 +90,7 @@ pub fn get_core_dal(shell: &Shell, url: Option<String>) -> anyhow::Result<Dal> {
 fn get_secrets(shell: &Shell) -> anyhow::Result<SecretsConfig> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
     let chain_config = ecosystem_config
-        .load_chain(global_config().chain_name.clone())
+        .load_current_chain()
         .ok_or(anyhow!(MSG_CHAIN_NOT_FOUND_ERR))?;
     let secrets = chain_config.get_secrets_config()?;