diff --git a/deployment/data-streams/changeset/call_configurator_promote_staging_config.go b/deployment/data-streams/changeset/call_configurator_promote_staging_config.go
index 9f248faed3e..aed9b41e598 100644
--- a/deployment/data-streams/changeset/call_configurator_promote_staging_config.go
+++ b/deployment/data-streams/changeset/call_configurator_promote_staging_config.go
@@ -50,7 +50,6 @@ func promoteStagingConfigPrecondition(_ deployment.Environment, cc PromoteStagin
 	if err := cc.Validate(); err != nil {
 		return fmt.Errorf("invalid DeployConfiguratorConfig: %w", err)
 	}
-
 	return nil
 }
 
@@ -60,19 +59,16 @@ func promoteStagingConfigLogic(e deployment.Environment, cfg PromoteStagingConfi
 		return deployment.ChangesetOutput{}, err
 	}
 
-	chainSelectors := make([]uint64, 0, len(cfg.PromotionsByChain))
-	for chainSelector := range cfg.PromotionsByChain {
-		chainSelectors = append(chainSelectors, chainSelector)
-	}
-
 	allBatches := []mcmstypes.BatchOperation{}
 
-	var (
-		timelockAddressPerChain   map[uint64]string
-		proposerAddressPerChain   map[uint64]string
-		inspectorPerChain         map[uint64]mcmssdk.Inspector
-		timelockAddressesPerChain map[uint64]string
-	)
+	var timelockAddressesPerChain map[uint64]string
+	var proposerAddressPerChain map[uint64]string
+	var inspectorPerChain map[uint64]mcmssdk.Inspector
+	if cfg.MCMSConfig != nil {
+		timelockAddressesPerChain = make(map[uint64]string)
+		proposerAddressPerChain = make(map[uint64]string)
+		inspectorPerChain = make(map[uint64]mcmssdk.Inspector)
+	}
 
 	for chainSelector, promotions := range cfg.PromotionsByChain {
 		chain, chainExists := e.Chains[chainSelector]
@@ -87,10 +83,8 @@ func promoteStagingConfigLogic(e deployment.Environment, cfg PromoteStagingConfi
 
 		if cfg.MCMSConfig != nil {
 			chainState := state.Chains[chainSelector]
-
-			timelockAddressPerChain[chainSelector] = chainState.Timelock.Address().String()
+			timelockAddressesPerChain[chainSelector] = chainState.Timelock.Address().String()
 			proposerAddressPerChain[chainSelector] = chainState.ProposerMcm.Address().String()
-			timelockAddressPerChain[chainSelector] = chainState.Timelock.Address().String()
 			inspectorPerChain[chainSelector] = evm.NewInspector(chain.Client)
 		}
 
@@ -106,8 +100,13 @@ func promoteStagingConfigLogic(e deployment.Environment, cfg PromoteStagingConfi
 				return deployment.ChangesetOutput{}, err
 			}
 
-			op := evm.NewTransaction(promotion.ConfiguratorAddress, tx.Data(), big.NewInt(0), string(types.Configurator), []string{})
-
+			op := evm.NewTransaction(
+				promotion.ConfiguratorAddress,
+				tx.Data(),
+				big.NewInt(0),
+				string(types.Configurator),
+				[]string{},
+			)
 			batch.Transactions = append(batch.Transactions, op)
 		}
 
@@ -115,7 +114,6 @@ func promoteStagingConfigLogic(e deployment.Environment, cfg PromoteStagingConfi
 	}
 
 	if cfg.MCMSConfig != nil {
-
 		proposal, err := proposalutils.BuildProposalFromBatchesV2(
 			e,
 			timelockAddressesPerChain,
diff --git a/deployment/data-streams/changeset/call_configurator_promote_staging_config_test.go b/deployment/data-streams/changeset/call_configurator_promote_staging_config_test.go
index 0ac4bb307ba..a6529d8baec 100644
--- a/deployment/data-streams/changeset/call_configurator_promote_staging_config_test.go
+++ b/deployment/data-streams/changeset/call_configurator_promote_staging_config_test.go
@@ -39,6 +39,8 @@ func TestCallPromoteStagingConfig(t *testing.T) {
 	require.Len(t, ab, 1)
 
 	configuratorAddrHex, err := deployment.SearchAddressBook(e.ExistingAddresses, testutil.TestChain.Selector, types.Configurator)
+	require.NoError(t, err)
+
 	configuratorAddr := common.HexToAddress(configuratorAddrHex)
 
 	// Prepare a production onchain config (64 bytes):
diff --git a/deployment/data-streams/changeset/call_configurator_set_staging_config.go b/deployment/data-streams/changeset/call_configurator_set_staging_config.go
index cfff11c5acf..20428c47eae 100644
--- a/deployment/data-streams/changeset/call_configurator_set_staging_config.go
+++ b/deployment/data-streams/changeset/call_configurator_set_staging_config.go
@@ -73,17 +73,9 @@ func callSetConfigCommon[T ConfiguratorConfig](
 		return deployment.ChangesetOutput{}, err
 	}
 
-	chainSelectors := make([]uint64, 0, len(configurationsByChain))
-	for chainSelector := range configurationsByChain {
-		chainSelectors = append(chainSelectors, chainSelector)
-	}
-
-	var (
-		timelockAddressPerChain   map[uint64]string
-		proposerAddressPerChain   map[uint64]string
-		inspectorPerChain         map[uint64]mcmssdk.Inspector
-		timelockAddressesPerChain map[uint64]string
-	)
+	timelockAddressesPerChain := make(map[uint64]string)
+	proposerAddressPerChain := make(map[uint64]string)
+	inspectorPerChain := make(map[uint64]mcmssdk.Inspector)
 
 	allBatches := []mcmstypes.BatchOperation{}
 
@@ -100,9 +92,8 @@ func callSetConfigCommon[T ConfiguratorConfig](
 		if mcmsConfig != nil {
 			chainState := state.Chains[chainSelector]
 
-			timelockAddressPerChain[chainSelector] = chainState.Timelock.Address().String()
+			timelockAddressesPerChain[chainSelector] = chainState.Timelock.Address().String()
 			proposerAddressPerChain[chainSelector] = chainState.ProposerMcm.Address().String()
-			timelockAddressPerChain[chainSelector] = chainState.Timelock.Address().String()
 			inspectorPerChain[chainSelector] = evm.NewInspector(chain.Client)
 		}
 
@@ -127,7 +118,6 @@ func callSetConfigCommon[T ConfiguratorConfig](
 	}
 
 	if mcmsConfig != nil {
-
 		proposal, err := proposalutils.BuildProposalFromBatchesV2(
 			e,
 			timelockAddressesPerChain,