diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/FederationContext.java b/rskj-core/src/main/java/co/rsk/peg/federation/FederationContext.java
index 31d855abdb..f7c0091f87 100644
--- a/rskj-core/src/main/java/co/rsk/peg/federation/FederationContext.java
+++ b/rskj-core/src/main/java/co/rsk/peg/federation/FederationContext.java
@@ -8,11 +8,13 @@
 
 public class FederationContext {
     private final Federation activeFederation;
-    private Federation retiringFederation;
-    private Script lastRetiredFederationP2SHScript;
+    private final Federation retiringFederation;
+    private final Script lastRetiredFederationP2SHScript;
 
-    public FederationContext(Federation activeFederation) {
-        this.activeFederation = activeFederation;
+    private FederationContext(FederationContextBuilder federationContextBuilder) {
+        this.activeFederation = federationContextBuilder.activeFederation;
+        this.retiringFederation = federationContextBuilder.retiringFederation;
+        this.lastRetiredFederationP2SHScript = federationContextBuilder.lastRetiredFederationP2SHScript;
     }
 
     public Federation getActiveFederation() {
@@ -23,21 +25,43 @@ public Optional<Federation> getRetiringFederation() {
         return Optional.ofNullable(retiringFederation);
     }
 
-    public void setRetiringFederation(Federation retiringFederation) {
-        this.retiringFederation = retiringFederation;
-    }
-
     public Optional<Script> getLastRetiredFederationP2SHScript() {
         return Optional.ofNullable(lastRetiredFederationP2SHScript);
     }
 
-    public void setLastRetiredFederationP2SHScript(Script lastRetiredFederationP2SHScript) {
-        this.lastRetiredFederationP2SHScript = lastRetiredFederationP2SHScript;
-    }
-
     public List<Federation> getLiveFederations() {
         return Stream.of(activeFederation, retiringFederation)
             .filter(Objects::nonNull)
             .toList();
     }
+
+    public static FederationContextBuilder builder() {
+        return new FederationContextBuilder();
+    }
+
+    public static class FederationContextBuilder {
+        private Federation activeFederation;
+        private Federation retiringFederation;
+        private Script lastRetiredFederationP2SHScript;
+
+        public FederationContextBuilder setActiveFederation(Federation activeFederation) {
+            this.activeFederation = Objects.requireNonNull(activeFederation, "Active federation must not be null");
+            return this;
+        }
+
+        public FederationContextBuilder setRetiringFederation(Federation retiringFederation) {
+            this.retiringFederation = retiringFederation;
+            return this;
+        }
+
+        public FederationContextBuilder setLastRetiredFederationP2SHScript(Script lastRetiredFederationP2SHScript) {
+            this.lastRetiredFederationP2SHScript = lastRetiredFederationP2SHScript;
+            return this;
+        }
+
+        public FederationContext build() {
+            Objects.requireNonNull(activeFederation, "Active federation is required");
+            return new FederationContext(this);
+        }
+    }
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupportImpl.java b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupportImpl.java
index 224c90e253..da3d658ebc 100644
--- a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupportImpl.java
+++ b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupportImpl.java
@@ -302,15 +302,16 @@ public List<Federation> getLiveFederations() {
 
     @Override
     public FederationContext getFederationContext() {
-        FederationContext federationContext = new FederationContext(getActiveFederation());
+        FederationContext.FederationContextBuilder federationContextBuilder = FederationContext.builder();
+        federationContextBuilder.setActiveFederation(getActiveFederation());
 
         Optional.ofNullable(getRetiringFederation())
-            .ifPresent(federationContext::setRetiringFederation);
+            .ifPresent(federationContextBuilder::setRetiringFederation);
 
         provider.getLastRetiredFederationP2SHScript(activations)
-            .ifPresent(federationContext::setLastRetiredFederationP2SHScript);
+            .ifPresent(federationContextBuilder::setLastRetiredFederationP2SHScript);
 
-        return federationContext;
+        return federationContextBuilder.build();
     }
 
     @Override
diff --git a/rskj-core/src/test/java/co/rsk/peg/PegUtilsGetTransactionTypeTest.java b/rskj-core/src/test/java/co/rsk/peg/PegUtilsGetTransactionTypeTest.java
index c2df92e870..a0ca153e7b 100644
--- a/rskj-core/src/test/java/co/rsk/peg/PegUtilsGetTransactionTypeTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/PegUtilsGetTransactionTypeTest.java
@@ -37,6 +37,8 @@ class PegUtilsGetTransactionTypeTest {
 
     private static final int FIRST_OUTPUT_INDEX = 0;
     private static final int FIRST_INPUT_INDEX = 0;
+    
+    private FederationContext federationContext;
 
     private BridgeStorageProvider provider;
     private Address userAddress;
@@ -73,6 +75,10 @@ void init() {
         );
         activeFederation = createP2shErpFederation(federationMainNetConstants, activeFedSigners);
 
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .build();
+
         int btcHeightWhenPegoutTxIndexActivates = bridgeMainnetConstants.getBtcHeightWhenPegoutTxIndexActivates();
         int pegoutTxIndexGracePeriodInBtcBlocks = bridgeMainnetConstants.getPegoutTxIndexGracePeriodInBtcBlocks();
         heightAtWhichToStartUsingPegoutIndex = btcHeightWhenPegoutTxIndexActivates + pegoutTxIndexGracePeriodInBtcBlocks;
@@ -193,11 +199,15 @@ void test_tx_sending_funds_to_unknown_address(
         btcTransaction.addOutput(shouldSendAmountBelowMinimum? belowMinimumPeginTxValue: minimumPeginTxValue, userAddress);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
+        FederationContext.FederationContextBuilder federationContextBuilder = FederationContext.builder();
+        federationContextBuilder.setActiveFederation(activeFederation);
+
         if (existsRetiringFederation) {
-            federationContext.setRetiringFederation(retiringFederation);
+            federationContextBuilder.setRetiringFederation(retiringFederation);
         }
+        federationContextBuilder.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
+        federationContext = federationContextBuilder.build();
+
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -252,7 +262,6 @@ void pegin_v1_active_fed(
         btcTransaction.addOutput(Coin.ZERO, opReturnScript);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -288,7 +297,6 @@ void multisig_signed_pegin_active_fed(
         FederationTestUtils.addSignatures(unknownFed, signers, btcTransaction);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -326,7 +334,6 @@ void pegin_active_fed_with_bech32_output(
         FederationTestUtils.addSignatures(unknownFed, unknownFedSigners, btcTransaction);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -352,7 +359,6 @@ void pegin_active_fed(
         btcTransaction.addOutput(Coin.COIN, activeFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -381,7 +387,6 @@ void pegin_output_to_active_fed_and_other_addresses(
         btcTransaction.addOutput(Coin.COIN, BitcoinTestUtils.createP2PKHAddress(btcMainnetParams, "unknown2"));
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -410,7 +415,6 @@ void pegin_multiple_outputs_to_active_fed(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -466,7 +470,6 @@ void pegin_multiple_outputs_to_active_fed_sum_amount_equal_to_minimum_pegin(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -494,8 +497,10 @@ void pegin_output_to_retiring_fed_and_other_addresses(
         btcTransaction.addOutput(Coin.COIN, BitcoinTestUtils.createP2PKHAddress(btcMainnetParams, "unknown2"));
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -522,8 +527,10 @@ void pegin_retiring_fed(
         btcTransaction.addOutput(Coin.COIN, retiringFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -576,8 +583,10 @@ void pegin_retired_fed(
         Script lastRetiredFederationP2SHScript = retiredFed.getP2SHScript();
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -607,8 +616,10 @@ void pegin_multiple_outputs_to_retiring_fed(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -637,8 +648,10 @@ void pegin_outputs_to_active_and_retiring_fed(
         btcTransaction.addOutput(Coin.COIN, retiringFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -669,8 +682,10 @@ void pegin_outputs_to_active_and_retiring_fed_and_other_address(
         btcTransaction.addOutput(Coin.COIN, userAddress);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -696,7 +711,6 @@ void pegin_below_minimum_active_fed() {
         btcTransaction.addOutput(minimumPeginTxValue.minus(Coin.SATOSHI), activeFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -722,7 +736,6 @@ void anyAddressToAnyAddress_pegin_before_RSKIP379() {
         anyToAnyTx.addOutput(minimumPeginTxValue, new Script(new byte[]{}) );
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             fingerrootActivations,
             mock(BridgeStorageProvider.class),
@@ -748,7 +761,6 @@ void pegin_anyAddressToAnyAddress_below_minimum_pegin_before_RSIP379() {
         anyToAnyTx.addOutput(belowMinimum, new Script(new byte[]{}));
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             fingerrootActivations,
             mock(BridgeStorageProvider.class),
@@ -774,7 +786,6 @@ void unknown_anyAddressToAnyAddress_unknown_after_RSIP379_and_using_pegout_tx_in
         anyToAnyTx.addOutput(minimumPeginTxValue, new Script(new byte[]{}) );
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             arrowheadActivations,
             mock(BridgeStorageProvider.class),
@@ -800,7 +811,6 @@ void unknown_anyAddressToAnyAddress_below_minimum_unknown_after_RSIP379_and_usin
         anyToAnyTx.addOutput(belowMinimum, new Script(new byte[]{}));
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             arrowheadActivations,
             mock(BridgeStorageProvider.class),
@@ -855,7 +865,6 @@ void sending_funds_below_minimum_active_fed(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -889,7 +898,6 @@ void sending_funds_below_and_above_minimum_active_fed(
         peginTx.addOutput(Coin.COIN, activeFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -937,7 +945,6 @@ void sending_funds_equal_to_minimum_active_fed(
         peginTx.addOutput(minimumPeginTxValue, activeFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -965,7 +972,6 @@ void sending_funds_above_minimum_active_fed(
         peginTx.addOutput(minimumPeginTxValue, activeFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1030,7 +1036,6 @@ void pegout_no_change_output(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1057,7 +1062,6 @@ void pegout_no_change_output_sighash_no_exists_in_provider() {
         btcTransaction.getInput(FIRST_INPUT_INDEX).setScriptSig(inputScript);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1118,7 +1122,6 @@ void many_outputs_and_inputs_pegout(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1177,7 +1180,6 @@ void many_outputs_and_one_input_pegout(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1223,7 +1225,6 @@ void one_outputs_and_many_input_pegout(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1251,7 +1252,6 @@ void standard_pegout_sighash_no_exists_in_provider() {
         btcTransaction.getInput(FIRST_INPUT_INDEX).setScriptSig(inputScript);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1290,8 +1290,10 @@ void migration() {
         when(provider.hasPegoutTxSigHash(firstInputSigHash)).thenReturn(true);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1322,8 +1324,10 @@ void migration_sighash_no_exists_in_provider() {
         btcTransaction.getInput(FIRST_INPUT_INDEX).setScriptSig(inputScript);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1360,7 +1364,6 @@ void migration_from_retired_fed() {
         when(provider.hasPegoutTxSigHash(firstInputSigHash)).thenReturn(true);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
             provider,
@@ -1445,8 +1448,10 @@ void many_outputs_and_inputs_migration(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1508,8 +1513,10 @@ void many_outputs_and_one_input_migration(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1557,8 +1564,10 @@ void one_outputs_and_many_input_migration(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1714,11 +1723,13 @@ void flyover_pegin(
         btcTransaction.addOutput(shouldSendAmountBelowMinimum? belowMinimumPeginTxValue: minimumPeginTxValue, flyoverFederationAddress);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
+        FederationContext.FederationContextBuilder federationContextBuilder = FederationContext.builder();
+        federationContextBuilder.setActiveFederation(activeFederation);
+        federationContextBuilder.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
         if (existsRetiringFederation) {
-            federationContext.setRetiringFederation(retiringFederation);
+            federationContextBuilder.setRetiringFederation(retiringFederation);
         }
+        federationContext = federationContextBuilder.build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1779,11 +1790,13 @@ void flyover_segwit_pegin(
         btcTransaction.addOutput(createBech32Output(bridgeMainnetConstants.getBtcParams(), minimumPeginTxValue));
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
+        FederationContext.FederationContextBuilder federationContextBuilder = FederationContext.builder();
+        federationContextBuilder.setActiveFederation(activeFederation);
+        federationContextBuilder.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
         if (existsRetiringFederation) {
-            federationContext.setRetiringFederation(retiringFederation);
+            federationContextBuilder.setRetiringFederation(retiringFederation);
         }
+        federationContext = federationContextBuilder.build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1877,8 +1890,10 @@ void flyover_segwit_migration(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -1958,8 +1973,10 @@ void flyover_segwit_with_other_inputs_migration(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -2040,8 +2057,10 @@ void flyover_segwit_with_many_inputs_and_outputs_migration(
         }
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType pegTxType = PegUtils.getTransactionType(
             activations,
@@ -2116,8 +2135,10 @@ void old_fed_to_live_fed(
         assertTrue(PegUtilsLegacy.txIsFromOldFederation(migrationTx, oldFederation.getAddress()));
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType transactionType = PegUtils.getTransactionType(
             activations,
@@ -2184,8 +2205,10 @@ void last_retired_fed_to_live_fed(
         when(provider.hasPegoutTxSigHash(firstInputSigHash.get())).thenReturn(true);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScript)
+            .build();
 
         PegTxType transactionType = PegUtils.getTransactionType(
             activations,
@@ -2254,7 +2277,6 @@ void retired_fed_no_existing_in_the_storage_to_live_fed(
         when(provider.hasPegoutTxSigHash(firstInputSigHash.get())).thenReturn(true);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
         PegTxType transactionType = PegUtils.getTransactionType(
             activations,
             provider,
diff --git a/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyGetTransactionTypeTest.java b/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyGetTransactionTypeTest.java
index 1ebcd9d3d4..dc37783147 100644
--- a/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyGetTransactionTypeTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyGetTransactionTypeTest.java
@@ -40,6 +40,7 @@ class PegUtilsLegacyGetTransactionTypeTest {
     );
 
     private static Context btcContext;
+    private FederationContext federationContext;
 
     @BeforeEach
     void setUp() {
@@ -102,8 +103,10 @@ void test_sentFromP2SHErpFed() {
         FederationTestUtils.addSignatures(p2shRetiringFederation, fedKeys, migrationTx);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(p2shRetiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(p2shRetiringFederation)
+            .build();
 
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             migrationTx,
@@ -164,10 +167,13 @@ void test_sentFromOldFed(ActivationConfig.ForBlock activations, PegTxType expect
         FederationTestUtils.addSignatures(retiredFederation, REGTEST_OLD_FEDERATION_PRIVATE_KEYS, migrationTx);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
+        FederationContext.FederationContextBuilder federationContextBuilder = FederationContext.builder();
+        federationContextBuilder.setActiveFederation(activeFederation);
         if (activations.isActive(RSKIP186)) {
-            federationContext.setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript());
+            federationContextBuilder.setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript());
         }
+        federationContext = federationContextBuilder.build();
+
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             migrationTx,
             federationContext,
@@ -211,7 +217,10 @@ void test_sentFromP2SH_pegin() {
         FederationTestUtils.addSignatures(unknownFed, unknownFedSigners, peginTx);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .build();
+
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             peginTx,
             federationContext,
@@ -366,9 +375,11 @@ void test_pegin(
         peginTx.addOutput(amountToSend, activeFederation.getAddress());
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
-        federationContext.setLastRetiredFederationP2SHScript(retiredFederationP2SHScript);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .setLastRetiredFederationP2SHScript(retiredFederationP2SHScript)
+            .build();
 
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             peginTx,
@@ -411,7 +422,10 @@ void test_pegout_tx() {
         FederationTestUtils.addSignatures(activeFederation, fedKeys, pegoutBtcTx);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .build();
+
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             pegoutBtcTx,
             federationContext,
@@ -453,8 +467,10 @@ void test_migration_tx() {
         FederationTestUtils.addSignatures(retiringFederation, retiringFedKeys, migrationTx);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             migrationTx,
@@ -503,8 +519,10 @@ void test_migration_to_p2shFed_tx() {
         FederationTestUtils.addSignatures(retiringFederation, retiringFedKeys, migrationTx);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             migrationTx,
@@ -543,8 +561,10 @@ void test_migration_from_and_to_p2shFed_tx() {
         FederationTestUtils.addSignatures(retiringFederation, retiringFedKeys, migrationTx);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             migrationTx,
@@ -573,7 +593,10 @@ void test_unknown_tx() {
         unknownPegTx.addOutput(Coin.COIN, unknownAddress);
 
         // Act
-        FederationContext federationContext = new FederationContext(activeFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .build();
+
         PegTxType transactionType = PegUtilsLegacy.getTransactionType(
             unknownPegTx,
             federationContext,
diff --git a/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java b/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java
index 452b2f9254..c08a458694 100644
--- a/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/PegUtilsLegacyTest.java
@@ -27,6 +27,12 @@
 import org.junit.jupiter.api.*;
 
 class PegUtilsLegacyTest {
+    private static final Instant creationTime = Instant.ofEpochMilli(1000L);
+    private static final List<BtcECKey> REGTEST_FEDERATION_PRIVATE_KEYS = Arrays.asList(
+        BtcECKey.fromPrivate(Hex.decode("45c5b07fc1a6f58892615b7c31dca6c96db58c4bbc538a6b8a22999aaa860c32")),
+        BtcECKey.fromPrivate(Hex.decode("505334c7745df2fc61486dffb900784505776a898377172ffa77384892749179")),
+        BtcECKey.fromPrivate(Hex.decode("bed0af2ce8aa8cb2bc3f9416c9d518fdee15d1ff15b8ded28376fcb23db6db69"))
+    );
 
     private ActivationConfig.ForBlock activations;
     private BridgeConstants bridgeConstantsRegtest;
@@ -34,12 +40,6 @@ class PegUtilsLegacyTest {
     private BridgeConstants bridgeConstantsMainnet;
     private FederationConstants federationConstantsMainnet;
     private NetworkParameters networkParameters;
-    private final Instant creationTime = Instant.ofEpochMilli(1000L);
-    private static final List<BtcECKey> REGTEST_FEDERATION_PRIVATE_KEYS = Arrays.asList(
-        BtcECKey.fromPrivate(Hex.decode("45c5b07fc1a6f58892615b7c31dca6c96db58c4bbc538a6b8a22999aaa860c32")),
-        BtcECKey.fromPrivate(Hex.decode("505334c7745df2fc61486dffb900784505776a898377172ffa77384892749179")),
-        BtcECKey.fromPrivate(Hex.decode("bed0af2ce8aa8cb2bc3f9416c9d518fdee15d1ff15b8ded28376fcb23db6db69"))
-    );
 
     @BeforeEach
     void setupConfig() {
@@ -1293,8 +1293,10 @@ void testIsMigrationTx_sending_funds_from_retired_p2sh_fed_to_active_p2sh_fed()
 
         Wallet federationWallet = new BridgeBtcWallet(btcContext, Collections.singletonList(activeFederation));
 
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript());
+        FederationContext federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript())
+            .build();
 
         assertFalse(isMigrationTx(
             migrationTx,
@@ -1304,7 +1306,10 @@ void testIsMigrationTx_sending_funds_from_retired_p2sh_fed_to_active_p2sh_fed()
             activations
         ));
 
-        federationContext.setLastRetiredFederationP2SHScript(retiredFederation.getDefaultP2SHScript());
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(retiredFederation.getDefaultP2SHScript())
+            .build();
         assertTrue(isMigrationTx(
             migrationTx,
             federationContext,
@@ -1356,8 +1361,11 @@ void testIsMigrationTx_sending_funds_from_retiring_p2sh_fed_to_active_p2sh_fed()
         migrationTx.addInput(migrationTxInput);
         signWithNecessaryKeys(retiringFederation, retiringFedKeys, migrationTxInput, migrationTx);
 
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        FederationContext federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
+
         Wallet federationsWallet = new BridgeBtcWallet(btcContext, federationContext.getLiveFederations());
 
         assertTrue(isMigrationTx(
@@ -1420,8 +1428,11 @@ void testIsMigrationTx_sending_funds_from_retired_standard_fed_to_active_p2sh_fe
         migrationTx.addInput(migrationTxInput);
         signWithNecessaryKeys(retiredFederation, retiredFederationKeys, migrationTxInput, migrationTx);
 
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript());
+        FederationContext federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript())
+            .build();
+
         Wallet federationWallet = new BridgeBtcWallet(btcContext, federationContext.getLiveFederations());
 
         assertTrue(isMigrationTx(
@@ -1476,8 +1487,10 @@ void testIsMigrationTx_sending_funds_from_retiring_standard_fed_to_active_p2sh_f
 
         Wallet federationWallet = new BridgeBtcWallet(btcContext, Collections.singletonList(activeFederation));
 
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        FederationContext federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         assertTrue(isMigrationTx(
             migrationTx,
@@ -1535,8 +1548,11 @@ void testIsMigrationTx_sending_funds_from_retired_standard_fed_to_active_standar
         migrationTx.addInput(migrationTxInput);
         signWithNecessaryKeys(retiredFederation, retiredFederationKeys, migrationTxInput, migrationTx);
 
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript());
+        FederationContext federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript())
+            .build();
+
         Wallet federationWallet = new BridgeBtcWallet(btcContext, federationContext.getLiveFederations());
 
         assertTrue(isMigrationTx(
@@ -1596,8 +1612,11 @@ void testIsMigrationTx_sending_funds_from_retiring_standard_fed_to_active_standa
         migrationTx.addInput(migrationTxInput);
         signWithNecessaryKeys(retiringFederation, retiringFederationKeys, migrationTxInput, migrationTx);
 
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        FederationContext federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
+
         Wallet federationsWallet = new BridgeBtcWallet(btcContext, federationContext.getLiveFederations());
 
         assertTrue(isMigrationTx(
@@ -1668,8 +1687,11 @@ void testIsMigrationTx() {
         migrationTx.addInput(migrationTxInput);
         signWithNecessaryKeys(retiringFederation, retiringFederationKeys, migrationTxInput, migrationTx);
 
-        FederationContext federationContext = new FederationContext(activeFederation);
-        federationContext.setRetiringFederation(retiringFederation);
+        FederationContext federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
+
         Wallet federationsWallet = new BridgeBtcWallet(btcContext, federationContext.getLiveFederations());
 
         assertTrue(isMigrationTx(
@@ -1711,7 +1733,11 @@ void testIsMigrationTx() {
             activations
         ));
 
-        federationContext.setRetiringFederation(null);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(null)
+            .build();
+
         Wallet federationWallet = new BridgeBtcWallet(btcContext, federationContext.getLiveFederations());
 
         assertFalse(isMigrationTx(
@@ -1732,7 +1758,11 @@ void testIsMigrationTx() {
         );
         retiredMigrationTx.addInput(retiredMigrationTxInput);
         signWithNecessaryKeys(retiredFederation, retiredFederationKeys, retiredMigrationTxInput, retiredMigrationTx);
-        federationContext.setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript());
+
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript())
+            .build();
         assertTrue(isMigrationTx(
             retiredMigrationTx,
             federationContext,
@@ -1748,7 +1778,11 @@ void testIsMigrationTx() {
             activations
         ));
 
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(retiredFederation.getP2SHScript())
+            .setRetiringFederation(retiringFederation)
+            .build();
         assertTrue(isMigrationTx(
             retiredMigrationTx,
             federationContext,
diff --git a/rskj-core/src/test/java/co/rsk/peg/federation/FederationContextTest.java b/rskj-core/src/test/java/co/rsk/peg/federation/FederationContextTest.java
index 17685df413..66f7128f11 100644
--- a/rskj-core/src/test/java/co/rsk/peg/federation/FederationContextTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/federation/FederationContextTest.java
@@ -20,8 +20,11 @@ class FederationContextTest {
     @BeforeEach
     void setup() {
         activeFederation = buildActiveFederation();
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .build();
+
         retiringFederation = buildRetiringFederation();
-        federationContext = new FederationContext(activeFederation);
     }
 
     @Test
@@ -36,7 +39,10 @@ void getRetiringFederation() {
 
     @Test
     void setRetiringFederation() {
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
 
         Optional<Federation> retiringFederationFromFederationContext = federationContext.getRetiringFederation();
 
@@ -52,7 +58,10 @@ void getLastRetiredFederationP2SHScript() {
     @Test
     void setLastRetiredFederationP2SHScript() {
         Script lastRetiredFederationP2SHScriptExpected = retiringFederation.getP2SHScript();
-        federationContext.setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScriptExpected);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setLastRetiredFederationP2SHScript(lastRetiredFederationP2SHScriptExpected)
+            .build();
 
         Optional<Script> lastRetiredFederationP2SHScriptFromFederationContext = federationContext.getLastRetiredFederationP2SHScript();
 
@@ -70,7 +79,11 @@ void getLiveFederations_withOnlyActiveFederation() {
 
     @Test
     void getLiveFederations_withActiveAndRetiringFederations() {
-        federationContext.setRetiringFederation(retiringFederation);
+        federationContext = FederationContext.builder()
+            .setActiveFederation(activeFederation)
+            .setRetiringFederation(retiringFederation)
+            .build();
+
         List<Federation> liveFederations = federationContext.getLiveFederations();
 
         assertEquals(2, liveFederations.size());