diff --git a/consensus/consensus_v2.go b/consensus/consensus_v2.go
index 2806e37a73..3ae3d4fad8 100644
--- a/consensus/consensus_v2.go
+++ b/consensus/consensus_v2.go
@@ -689,12 +689,16 @@ func (consensus *Consensus) commitBlock(blk *types.Block, committedMsg *FBFTMess
 // rotateLeader rotates the leader to the next leader in the committee.
 // This function must be called with enabled leader rotation.
 func (consensus *Consensus) rotateLeader(epoch *big.Int) {
+	// Feature activated only for non-beacon shards.
+	if consensus.ShardID == shard.BeaconChainShardID {
+		return
+	}
 	var (
 		bc     = consensus.Blockchain()
 		prev   = consensus.getLeaderPubKey()
 		leader = consensus.getLeaderPubKey()
 	)
-	utils.Logger().Info().Msgf("[Rotating leader] epoch: %v rotation:%v external rotation %v", epoch.Uint64(), bc.Config().IsLeaderRotation(epoch), bc.Config().IsLeaderRotationExternalValidatorsAllowed(epoch, consensus.ShardID))
+	utils.Logger().Info().Msgf("[Rotating leader] epoch: %v rotation:%v ", epoch.Uint64(), bc.Config().IsNonBeaconLeaderRotation(epoch))
 	ss, err := bc.ReadShardState(epoch)
 	if err != nil {
 		utils.Logger().Error().Err(err).Msg("Failed to read shard state")
@@ -746,15 +750,7 @@ func (consensus *Consensus) rotateLeader(epoch *big.Int) {
 	// Passed all checks, we can change leader.
 	// NthNext will move the leader to the next leader in the committee.
 	// It does not know anything about external or internal validators.
-	var (
-		wasFound bool
-		next     *bls.PublicKeyWrapper
-	)
-	if bc.Config().IsLeaderRotationExternalValidatorsAllowed(epoch, consensus.ShardID) {
-		wasFound, next = consensus.Decider.NthNext(leader, 1)
-	} else {
-		wasFound, next = consensus.Decider.NthNextHmy(shard.Schedule.InstanceForEpoch(epoch), leader, 1)
-	}
+	wasFound, next := consensus.Decider.NthNext(leader, 1)
 	if !wasFound {
 		utils.Logger().Error().Msg("Failed to get next leader")
 		return
@@ -780,7 +776,7 @@ func (consensus *Consensus) setupForNewConsensus(blk *types.Block, committedMsg
 	} else {
 		epoch = blk.Epoch()
 	}
-	if consensus.Blockchain().Config().IsLeaderRotation(epoch) {
+	if consensus.Blockchain().Config().IsNonBeaconLeaderRotation(epoch) {
 		consensus.rotateLeader(epoch)
 	}
 
diff --git a/consensus/view_change.go b/consensus/view_change.go
index 45838f9bc4..dc7c7fa5dc 100644
--- a/consensus/view_change.go
+++ b/consensus/view_change.go
@@ -202,14 +202,14 @@ func (consensus *Consensus) getNextLeaderKey(viewID uint64) *bls.PublicKeyWrappe
 	// FIXME: rotate leader on harmony nodes only before fully externalization
 	var wasFound bool
 	var next *bls.PublicKeyWrapper
-	if blockchain != nil && blockchain.Config().IsLeaderRotation(epoch) {
-		if blockchain.Config().IsLeaderRotationExternalValidatorsAllowed(epoch, consensus.ShardID) {
-			wasFound, next = consensus.Decider.NthNext(
+	if blockchain != nil && blockchain.Config().IsNonBeaconLeaderRotation(epoch) {
+		if consensus.ShardID == shard.BeaconChainShardID {
+			wasFound, next = consensus.Decider.NthNextHmy(
+				shard.Schedule.InstanceForEpoch(epoch),
 				lastLeaderPubKey,
 				gap)
 		} else {
-			wasFound, next = consensus.Decider.NthNextHmy(
-				shard.Schedule.InstanceForEpoch(epoch),
+			wasFound, next = consensus.Decider.NthNext(
 				lastLeaderPubKey,
 				gap)
 		}
diff --git a/internal/params/config.go b/internal/params/config.go
index 8690d0ac34..99e2a762ed 100644
--- a/internal/params/config.go
+++ b/internal/params/config.go
@@ -36,244 +36,238 @@ var once sync.Once
 var (
 	// MainnetChainConfig is the chain parameters to run a node on the main network.
 	MainnetChainConfig = &ChainConfig{
-		ChainID:                                MainnetChainID,
-		EthCompatibleChainID:                   EthMainnetShard0ChainID,
-		EthCompatibleShard0ChainID:             EthMainnetShard0ChainID,
-		EthCompatibleEpoch:                     big.NewInt(442), // Around Thursday Feb 4th 2020, 10AM PST
-		CrossTxEpoch:                           big.NewInt(28),
-		CrossLinkEpoch:                         big.NewInt(186),
-		AggregatedRewardEpoch:                  big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
-		StakingEpoch:                           big.NewInt(186),
-		PreStakingEpoch:                        big.NewInt(185),
-		QuickUnlockEpoch:                       big.NewInt(191),
-		FiveSecondsEpoch:                       big.NewInt(230),
-		TwoSecondsEpoch:                        big.NewInt(366), // Around Tuesday Dec 8th 2020, 8AM PST
-		SixtyPercentEpoch:                      big.NewInt(530), // Around Monday Apr 12th 2021, 22:30 UTC
-		RedelegationEpoch:                      big.NewInt(290),
-		NoEarlyUnlockEpoch:                     big.NewInt(530), // Around Monday Apr 12th 2021, 22:30 UTC
-		VRFEpoch:                               big.NewInt(631), // Around Wed July 7th 2021
-		PrevVRFEpoch:                           big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
-		MinDelegation100Epoch:                  big.NewInt(631), // Around Wed July 7th 2021
-		MinCommissionRateEpoch:                 big.NewInt(631), // Around Wed July 7th 2021
-		MinCommissionPromoPeriod:               big.NewInt(100),
-		EPoSBound35Epoch:                       big.NewInt(631), // Around Wed July 7th 2021
-		EIP155Epoch:                            big.NewInt(28),
-		S3Epoch:                                big.NewInt(28),
-		DataCopyFixEpoch:                       big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
-		IstanbulEpoch:                          big.NewInt(314),
-		ReceiptLogEpoch:                        big.NewInt(101),
-		SHA3Epoch:                              big.NewInt(725),  // Around Mon Oct 11 2021, 19:00 UTC
-		HIP6And8Epoch:                          big.NewInt(725),  // Around Mon Oct 11 2021, 19:00 UTC
-		StakingPrecompileEpoch:                 big.NewInt(871),  // Around Tue Feb 11 2022
-		ChainIdFixEpoch:                        big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
-		SlotsLimitedEpoch:                      big.NewInt(999),  // Around Fri, 27 May 2022 09:41:02 UTC with 2s block time
-		CrossShardXferPrecompileEpoch:          big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
-		AllowlistEpoch:                         EpochTBD,
-		FeeCollectEpoch:                        EpochTBD,
-		LeaderRotationExternalNonBeaconLeaders: EpochTBD,
-		LeaderRotationExternalBeaconLeaders:    EpochTBD,
+		ChainID:                       MainnetChainID,
+		EthCompatibleChainID:          EthMainnetShard0ChainID,
+		EthCompatibleShard0ChainID:    EthMainnetShard0ChainID,
+		EthCompatibleEpoch:            big.NewInt(442), // Around Thursday Feb 4th 2020, 10AM PST
+		CrossTxEpoch:                  big.NewInt(28),
+		CrossLinkEpoch:                big.NewInt(186),
+		AggregatedRewardEpoch:         big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
+		StakingEpoch:                  big.NewInt(186),
+		PreStakingEpoch:               big.NewInt(185),
+		QuickUnlockEpoch:              big.NewInt(191),
+		FiveSecondsEpoch:              big.NewInt(230),
+		TwoSecondsEpoch:               big.NewInt(366), // Around Tuesday Dec 8th 2020, 8AM PST
+		SixtyPercentEpoch:             big.NewInt(530), // Around Monday Apr 12th 2021, 22:30 UTC
+		RedelegationEpoch:             big.NewInt(290),
+		NoEarlyUnlockEpoch:            big.NewInt(530), // Around Monday Apr 12th 2021, 22:30 UTC
+		VRFEpoch:                      big.NewInt(631), // Around Wed July 7th 2021
+		PrevVRFEpoch:                  big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
+		MinDelegation100Epoch:         big.NewInt(631), // Around Wed July 7th 2021
+		MinCommissionRateEpoch:        big.NewInt(631), // Around Wed July 7th 2021
+		MinCommissionPromoPeriod:      big.NewInt(100),
+		EPoSBound35Epoch:              big.NewInt(631), // Around Wed July 7th 2021
+		EIP155Epoch:                   big.NewInt(28),
+		S3Epoch:                       big.NewInt(28),
+		DataCopyFixEpoch:              big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
+		IstanbulEpoch:                 big.NewInt(314),
+		ReceiptLogEpoch:               big.NewInt(101),
+		SHA3Epoch:                     big.NewInt(725),  // Around Mon Oct 11 2021, 19:00 UTC
+		HIP6And8Epoch:                 big.NewInt(725),  // Around Mon Oct 11 2021, 19:00 UTC
+		StakingPrecompileEpoch:        big.NewInt(871),  // Around Tue Feb 11 2022
+		ChainIdFixEpoch:               big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
+		SlotsLimitedEpoch:             big.NewInt(999),  // Around Fri, 27 May 2022 09:41:02 UTC with 2s block time
+		CrossShardXferPrecompileEpoch: big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
+		AllowlistEpoch:                EpochTBD,
+		FeeCollectEpoch:               EpochTBD,
+		NonBeaconLeaderRotation:       EpochTBD,
 	}
 
 	// TestnetChainConfig contains the chain parameters to run a node on the harmony test network.
 	TestnetChainConfig = &ChainConfig{
-		ChainID:                                TestnetChainID,
-		EthCompatibleChainID:                   EthTestnetShard0ChainID,
-		EthCompatibleShard0ChainID:             EthTestnetShard0ChainID,
-		EthCompatibleEpoch:                     big.NewInt(0),
-		CrossTxEpoch:                           big.NewInt(0),
-		CrossLinkEpoch:                         big.NewInt(2),
-		AggregatedRewardEpoch:                  big.NewInt(2),
-		StakingEpoch:                           big.NewInt(2),
-		PreStakingEpoch:                        big.NewInt(1),
-		QuickUnlockEpoch:                       big.NewInt(0),
-		FiveSecondsEpoch:                       big.NewInt(0),
-		TwoSecondsEpoch:                        big.NewInt(2),
-		SixtyPercentEpoch:                      big.NewInt(2),
-		RedelegationEpoch:                      big.NewInt(2),
-		NoEarlyUnlockEpoch:                     big.NewInt(2),
-		VRFEpoch:                               big.NewInt(2),
-		PrevVRFEpoch:                           big.NewInt(2),
-		MinDelegation100Epoch:                  big.NewInt(2),
-		MinCommissionRateEpoch:                 big.NewInt(2),
-		MinCommissionPromoPeriod:               big.NewInt(2),
-		EPoSBound35Epoch:                       big.NewInt(2),
-		EIP155Epoch:                            big.NewInt(0),
-		S3Epoch:                                big.NewInt(0),
-		DataCopyFixEpoch:                       big.NewInt(0),
-		IstanbulEpoch:                          big.NewInt(0),
-		ReceiptLogEpoch:                        big.NewInt(0),
-		SHA3Epoch:                              big.NewInt(0),
-		HIP6And8Epoch:                          big.NewInt(2),
-		StakingPrecompileEpoch:                 big.NewInt(2),
-		SlotsLimitedEpoch:                      big.NewInt(2),
-		ChainIdFixEpoch:                        big.NewInt(0),
-		CrossShardXferPrecompileEpoch:          big.NewInt(2),
-		AllowlistEpoch:                         big.NewInt(2),
-		LeaderRotationExternalNonBeaconLeaders: EpochTBD,
-		LeaderRotationExternalBeaconLeaders:    EpochTBD,
-		FeeCollectEpoch:                        EpochTBD,
+		ChainID:                       TestnetChainID,
+		EthCompatibleChainID:          EthTestnetShard0ChainID,
+		EthCompatibleShard0ChainID:    EthTestnetShard0ChainID,
+		EthCompatibleEpoch:            big.NewInt(0),
+		CrossTxEpoch:                  big.NewInt(0),
+		CrossLinkEpoch:                big.NewInt(2),
+		AggregatedRewardEpoch:         big.NewInt(2),
+		StakingEpoch:                  big.NewInt(2),
+		PreStakingEpoch:               big.NewInt(1),
+		QuickUnlockEpoch:              big.NewInt(0),
+		FiveSecondsEpoch:              big.NewInt(0),
+		TwoSecondsEpoch:               big.NewInt(2),
+		SixtyPercentEpoch:             big.NewInt(2),
+		RedelegationEpoch:             big.NewInt(2),
+		NoEarlyUnlockEpoch:            big.NewInt(2),
+		VRFEpoch:                      big.NewInt(2),
+		PrevVRFEpoch:                  big.NewInt(2),
+		MinDelegation100Epoch:         big.NewInt(2),
+		MinCommissionRateEpoch:        big.NewInt(2),
+		MinCommissionPromoPeriod:      big.NewInt(2),
+		EPoSBound35Epoch:              big.NewInt(2),
+		EIP155Epoch:                   big.NewInt(0),
+		S3Epoch:                       big.NewInt(0),
+		DataCopyFixEpoch:              big.NewInt(0),
+		IstanbulEpoch:                 big.NewInt(0),
+		ReceiptLogEpoch:               big.NewInt(0),
+		SHA3Epoch:                     big.NewInt(0),
+		HIP6And8Epoch:                 big.NewInt(2),
+		StakingPrecompileEpoch:        big.NewInt(2),
+		SlotsLimitedEpoch:             big.NewInt(2),
+		ChainIdFixEpoch:               big.NewInt(0),
+		CrossShardXferPrecompileEpoch: big.NewInt(2),
+		AllowlistEpoch:                big.NewInt(2),
+		NonBeaconLeaderRotation:       EpochTBD,
+		FeeCollectEpoch:               EpochTBD,
 	}
 	// PangaeaChainConfig contains the chain parameters for the Pangaea network.
 	// All features except for CrossLink are enabled at launch.
 	PangaeaChainConfig = &ChainConfig{
-		ChainID:                                PangaeaChainID,
-		EthCompatibleChainID:                   EthPangaeaShard0ChainID,
-		EthCompatibleShard0ChainID:             EthPangaeaShard0ChainID,
-		EthCompatibleEpoch:                     big.NewInt(0),
-		CrossTxEpoch:                           big.NewInt(0),
-		CrossLinkEpoch:                         big.NewInt(2),
-		AggregatedRewardEpoch:                  big.NewInt(3),
-		StakingEpoch:                           big.NewInt(2),
-		PreStakingEpoch:                        big.NewInt(1),
-		QuickUnlockEpoch:                       big.NewInt(0),
-		FiveSecondsEpoch:                       big.NewInt(0),
-		TwoSecondsEpoch:                        big.NewInt(0),
-		SixtyPercentEpoch:                      big.NewInt(0),
-		RedelegationEpoch:                      big.NewInt(0),
-		NoEarlyUnlockEpoch:                     big.NewInt(0),
-		VRFEpoch:                               big.NewInt(0),
-		PrevVRFEpoch:                           big.NewInt(0),
-		MinDelegation100Epoch:                  big.NewInt(0),
-		MinCommissionRateEpoch:                 big.NewInt(0),
-		MinCommissionPromoPeriod:               big.NewInt(10),
-		EPoSBound35Epoch:                       big.NewInt(0),
-		EIP155Epoch:                            big.NewInt(0),
-		S3Epoch:                                big.NewInt(0),
-		DataCopyFixEpoch:                       big.NewInt(0),
-		IstanbulEpoch:                          big.NewInt(0),
-		ReceiptLogEpoch:                        big.NewInt(0),
-		SHA3Epoch:                              big.NewInt(0),
-		HIP6And8Epoch:                          big.NewInt(0),
-		StakingPrecompileEpoch:                 big.NewInt(2), // same as staking
-		ChainIdFixEpoch:                        big.NewInt(0),
-		SlotsLimitedEpoch:                      EpochTBD, // epoch to enable HIP-16
-		CrossShardXferPrecompileEpoch:          big.NewInt(1),
-		AllowlistEpoch:                         EpochTBD,
-		LeaderRotationExternalNonBeaconLeaders: EpochTBD,
-		LeaderRotationExternalBeaconLeaders:    EpochTBD,
-		FeeCollectEpoch:                        EpochTBD,
+		ChainID:                       PangaeaChainID,
+		EthCompatibleChainID:          EthPangaeaShard0ChainID,
+		EthCompatibleShard0ChainID:    EthPangaeaShard0ChainID,
+		EthCompatibleEpoch:            big.NewInt(0),
+		CrossTxEpoch:                  big.NewInt(0),
+		CrossLinkEpoch:                big.NewInt(2),
+		AggregatedRewardEpoch:         big.NewInt(3),
+		StakingEpoch:                  big.NewInt(2),
+		PreStakingEpoch:               big.NewInt(1),
+		QuickUnlockEpoch:              big.NewInt(0),
+		FiveSecondsEpoch:              big.NewInt(0),
+		TwoSecondsEpoch:               big.NewInt(0),
+		SixtyPercentEpoch:             big.NewInt(0),
+		RedelegationEpoch:             big.NewInt(0),
+		NoEarlyUnlockEpoch:            big.NewInt(0),
+		VRFEpoch:                      big.NewInt(0),
+		PrevVRFEpoch:                  big.NewInt(0),
+		MinDelegation100Epoch:         big.NewInt(0),
+		MinCommissionRateEpoch:        big.NewInt(0),
+		MinCommissionPromoPeriod:      big.NewInt(10),
+		EPoSBound35Epoch:              big.NewInt(0),
+		EIP155Epoch:                   big.NewInt(0),
+		S3Epoch:                       big.NewInt(0),
+		DataCopyFixEpoch:              big.NewInt(0),
+		IstanbulEpoch:                 big.NewInt(0),
+		ReceiptLogEpoch:               big.NewInt(0),
+		SHA3Epoch:                     big.NewInt(0),
+		HIP6And8Epoch:                 big.NewInt(0),
+		StakingPrecompileEpoch:        big.NewInt(2), // same as staking
+		ChainIdFixEpoch:               big.NewInt(0),
+		SlotsLimitedEpoch:             EpochTBD, // epoch to enable HIP-16
+		CrossShardXferPrecompileEpoch: big.NewInt(1),
+		AllowlistEpoch:                EpochTBD,
+		NonBeaconLeaderRotation:       EpochTBD,
+		FeeCollectEpoch:               EpochTBD,
 	}
 
 	// PartnerChainConfig contains the chain parameters for the Partner network.
 	// This is the Devnet config
 	PartnerChainConfig = &ChainConfig{
-		ChainID:                                PartnerChainID,
-		EthCompatibleChainID:                   EthPartnerShard0ChainID,
-		EthCompatibleShard0ChainID:             EthPartnerShard0ChainID,
-		EthCompatibleEpoch:                     big.NewInt(0),
-		CrossTxEpoch:                           big.NewInt(0),
-		CrossLinkEpoch:                         big.NewInt(2),
-		AggregatedRewardEpoch:                  big.NewInt(3),
-		StakingEpoch:                           big.NewInt(2),
-		PreStakingEpoch:                        big.NewInt(1),
-		QuickUnlockEpoch:                       big.NewInt(0),
-		FiveSecondsEpoch:                       big.NewInt(0),
-		TwoSecondsEpoch:                        big.NewInt(0),
-		SixtyPercentEpoch:                      big.NewInt(4),
-		RedelegationEpoch:                      big.NewInt(0),
-		NoEarlyUnlockEpoch:                     big.NewInt(0),
-		VRFEpoch:                               big.NewInt(0),
-		PrevVRFEpoch:                           big.NewInt(0),
-		MinDelegation100Epoch:                  big.NewInt(0),
-		MinCommissionRateEpoch:                 big.NewInt(0),
-		MinCommissionPromoPeriod:               big.NewInt(10),
-		EPoSBound35Epoch:                       big.NewInt(0),
-		EIP155Epoch:                            big.NewInt(0),
-		S3Epoch:                                big.NewInt(0),
-		DataCopyFixEpoch:                       big.NewInt(0),
-		IstanbulEpoch:                          big.NewInt(0),
-		ReceiptLogEpoch:                        big.NewInt(0),
-		SHA3Epoch:                              big.NewInt(0),
-		HIP6And8Epoch:                          big.NewInt(0),
-		StakingPrecompileEpoch:                 big.NewInt(2),
-		ChainIdFixEpoch:                        big.NewInt(0),
-		SlotsLimitedEpoch:                      EpochTBD, // epoch to enable HIP-16
-		CrossShardXferPrecompileEpoch:          big.NewInt(1),
-		AllowlistEpoch:                         EpochTBD,
-		FeeCollectEpoch:                        big.NewInt(574),
-		LeaderRotationExternalNonBeaconLeaders: EpochTBD,
-		LeaderRotationExternalBeaconLeaders:    EpochTBD,
+		ChainID:                       PartnerChainID,
+		EthCompatibleChainID:          EthPartnerShard0ChainID,
+		EthCompatibleShard0ChainID:    EthPartnerShard0ChainID,
+		EthCompatibleEpoch:            big.NewInt(0),
+		CrossTxEpoch:                  big.NewInt(0),
+		CrossLinkEpoch:                big.NewInt(2),
+		AggregatedRewardEpoch:         big.NewInt(3),
+		StakingEpoch:                  big.NewInt(2),
+		PreStakingEpoch:               big.NewInt(1),
+		QuickUnlockEpoch:              big.NewInt(0),
+		FiveSecondsEpoch:              big.NewInt(0),
+		TwoSecondsEpoch:               big.NewInt(0),
+		SixtyPercentEpoch:             big.NewInt(4),
+		RedelegationEpoch:             big.NewInt(0),
+		NoEarlyUnlockEpoch:            big.NewInt(0),
+		VRFEpoch:                      big.NewInt(0),
+		PrevVRFEpoch:                  big.NewInt(0),
+		MinDelegation100Epoch:         big.NewInt(0),
+		MinCommissionRateEpoch:        big.NewInt(0),
+		MinCommissionPromoPeriod:      big.NewInt(10),
+		EPoSBound35Epoch:              big.NewInt(0),
+		EIP155Epoch:                   big.NewInt(0),
+		S3Epoch:                       big.NewInt(0),
+		DataCopyFixEpoch:              big.NewInt(0),
+		IstanbulEpoch:                 big.NewInt(0),
+		ReceiptLogEpoch:               big.NewInt(0),
+		SHA3Epoch:                     big.NewInt(0),
+		HIP6And8Epoch:                 big.NewInt(0),
+		StakingPrecompileEpoch:        big.NewInt(2),
+		ChainIdFixEpoch:               big.NewInt(0),
+		SlotsLimitedEpoch:             EpochTBD, // epoch to enable HIP-16
+		CrossShardXferPrecompileEpoch: big.NewInt(1),
+		AllowlistEpoch:                EpochTBD,
+		FeeCollectEpoch:               big.NewInt(574),
+		NonBeaconLeaderRotation:       EpochTBD,
 	}
 
 	// StressnetChainConfig contains the chain parameters for the Stress test network.
 	// All features except for CrossLink are enabled at launch.
 	StressnetChainConfig = &ChainConfig{
-		ChainID:                                StressnetChainID,
-		EthCompatibleChainID:                   EthStressnetShard0ChainID,
-		EthCompatibleShard0ChainID:             EthStressnetShard0ChainID,
-		EthCompatibleEpoch:                     big.NewInt(0),
-		CrossTxEpoch:                           big.NewInt(0),
-		CrossLinkEpoch:                         big.NewInt(2),
-		AggregatedRewardEpoch:                  big.NewInt(3),
-		StakingEpoch:                           big.NewInt(2),
-		PreStakingEpoch:                        big.NewInt(1),
-		QuickUnlockEpoch:                       big.NewInt(0),
-		FiveSecondsEpoch:                       big.NewInt(0),
-		TwoSecondsEpoch:                        big.NewInt(0),
-		SixtyPercentEpoch:                      big.NewInt(10),
-		RedelegationEpoch:                      big.NewInt(0),
-		NoEarlyUnlockEpoch:                     big.NewInt(0),
-		VRFEpoch:                               big.NewInt(0),
-		PrevVRFEpoch:                           big.NewInt(0),
-		MinDelegation100Epoch:                  big.NewInt(0),
-		MinCommissionRateEpoch:                 big.NewInt(0),
-		MinCommissionPromoPeriod:               big.NewInt(10),
-		EPoSBound35Epoch:                       big.NewInt(0),
-		EIP155Epoch:                            big.NewInt(0),
-		S3Epoch:                                big.NewInt(0),
-		DataCopyFixEpoch:                       big.NewInt(0),
-		IstanbulEpoch:                          big.NewInt(0),
-		ReceiptLogEpoch:                        big.NewInt(0),
-		SHA3Epoch:                              big.NewInt(0),
-		HIP6And8Epoch:                          big.NewInt(0),
-		StakingPrecompileEpoch:                 big.NewInt(2),
-		ChainIdFixEpoch:                        big.NewInt(0),
-		SlotsLimitedEpoch:                      EpochTBD, // epoch to enable HIP-16
-		CrossShardXferPrecompileEpoch:          big.NewInt(1),
-		AllowlistEpoch:                         EpochTBD,
-		FeeCollectEpoch:                        EpochTBD,
-		LeaderRotationExternalNonBeaconLeaders: EpochTBD,
-		LeaderRotationExternalBeaconLeaders:    EpochTBD,
+		ChainID:                       StressnetChainID,
+		EthCompatibleChainID:          EthStressnetShard0ChainID,
+		EthCompatibleShard0ChainID:    EthStressnetShard0ChainID,
+		EthCompatibleEpoch:            big.NewInt(0),
+		CrossTxEpoch:                  big.NewInt(0),
+		CrossLinkEpoch:                big.NewInt(2),
+		AggregatedRewardEpoch:         big.NewInt(3),
+		StakingEpoch:                  big.NewInt(2),
+		PreStakingEpoch:               big.NewInt(1),
+		QuickUnlockEpoch:              big.NewInt(0),
+		FiveSecondsEpoch:              big.NewInt(0),
+		TwoSecondsEpoch:               big.NewInt(0),
+		SixtyPercentEpoch:             big.NewInt(10),
+		RedelegationEpoch:             big.NewInt(0),
+		NoEarlyUnlockEpoch:            big.NewInt(0),
+		VRFEpoch:                      big.NewInt(0),
+		PrevVRFEpoch:                  big.NewInt(0),
+		MinDelegation100Epoch:         big.NewInt(0),
+		MinCommissionRateEpoch:        big.NewInt(0),
+		MinCommissionPromoPeriod:      big.NewInt(10),
+		EPoSBound35Epoch:              big.NewInt(0),
+		EIP155Epoch:                   big.NewInt(0),
+		S3Epoch:                       big.NewInt(0),
+		DataCopyFixEpoch:              big.NewInt(0),
+		IstanbulEpoch:                 big.NewInt(0),
+		ReceiptLogEpoch:               big.NewInt(0),
+		SHA3Epoch:                     big.NewInt(0),
+		HIP6And8Epoch:                 big.NewInt(0),
+		StakingPrecompileEpoch:        big.NewInt(2),
+		ChainIdFixEpoch:               big.NewInt(0),
+		SlotsLimitedEpoch:             EpochTBD, // epoch to enable HIP-16
+		CrossShardXferPrecompileEpoch: big.NewInt(1),
+		AllowlistEpoch:                EpochTBD,
+		FeeCollectEpoch:               EpochTBD,
+		NonBeaconLeaderRotation:       EpochTBD,
 	}
 
 	// LocalnetChainConfig contains the chain parameters to run for local development.
 	LocalnetChainConfig = &ChainConfig{
-		ChainID:                                TestnetChainID,
-		EthCompatibleChainID:                   EthTestnetShard0ChainID,
-		EthCompatibleShard0ChainID:             EthTestnetShard0ChainID,
-		EthCompatibleEpoch:                     big.NewInt(0),
-		CrossTxEpoch:                           big.NewInt(0),
-		CrossLinkEpoch:                         big.NewInt(2),
-		AggregatedRewardEpoch:                  big.NewInt(3),
-		StakingEpoch:                           big.NewInt(2),
-		PreStakingEpoch:                        big.NewInt(0),
-		QuickUnlockEpoch:                       big.NewInt(0),
-		FiveSecondsEpoch:                       big.NewInt(0),
-		TwoSecondsEpoch:                        big.NewInt(0),
-		SixtyPercentEpoch:                      EpochTBD, // Never enable it for localnet as localnet has no external validator setup
-		RedelegationEpoch:                      big.NewInt(0),
-		NoEarlyUnlockEpoch:                     big.NewInt(0),
-		VRFEpoch:                               big.NewInt(0),
-		PrevVRFEpoch:                           big.NewInt(0),
-		MinDelegation100Epoch:                  big.NewInt(0),
-		MinCommissionRateEpoch:                 big.NewInt(0),
-		MinCommissionPromoPeriod:               big.NewInt(10),
-		EPoSBound35Epoch:                       big.NewInt(0),
-		EIP155Epoch:                            big.NewInt(0),
-		S3Epoch:                                big.NewInt(0),
-		DataCopyFixEpoch:                       big.NewInt(0),
-		IstanbulEpoch:                          big.NewInt(0),
-		ReceiptLogEpoch:                        big.NewInt(0),
-		SHA3Epoch:                              big.NewInt(0),
-		HIP6And8Epoch:                          EpochTBD, // Never enable it for localnet as localnet has no external validator setup
-		StakingPrecompileEpoch:                 big.NewInt(2),
-		ChainIdFixEpoch:                        big.NewInt(0),
-		SlotsLimitedEpoch:                      EpochTBD, // epoch to enable HIP-16
-		CrossShardXferPrecompileEpoch:          big.NewInt(1),
-		AllowlistEpoch:                         EpochTBD,
-		LeaderRotationExternalNonBeaconLeaders: EpochTBD,
-		LeaderRotationExternalBeaconLeaders:    EpochTBD,
-		FeeCollectEpoch:                        big.NewInt(5),
+		ChainID:                       TestnetChainID,
+		EthCompatibleChainID:          EthTestnetShard0ChainID,
+		EthCompatibleShard0ChainID:    EthTestnetShard0ChainID,
+		EthCompatibleEpoch:            big.NewInt(0),
+		CrossTxEpoch:                  big.NewInt(0),
+		CrossLinkEpoch:                big.NewInt(2),
+		AggregatedRewardEpoch:         big.NewInt(3),
+		StakingEpoch:                  big.NewInt(2),
+		PreStakingEpoch:               big.NewInt(0),
+		QuickUnlockEpoch:              big.NewInt(0),
+		FiveSecondsEpoch:              big.NewInt(0),
+		TwoSecondsEpoch:               big.NewInt(0),
+		SixtyPercentEpoch:             EpochTBD, // Never enable it for localnet as localnet has no external validator setup
+		RedelegationEpoch:             big.NewInt(0),
+		NoEarlyUnlockEpoch:            big.NewInt(0),
+		VRFEpoch:                      big.NewInt(0),
+		PrevVRFEpoch:                  big.NewInt(0),
+		MinDelegation100Epoch:         big.NewInt(0),
+		MinCommissionRateEpoch:        big.NewInt(0),
+		MinCommissionPromoPeriod:      big.NewInt(10),
+		EPoSBound35Epoch:              big.NewInt(0),
+		EIP155Epoch:                   big.NewInt(0),
+		S3Epoch:                       big.NewInt(0),
+		DataCopyFixEpoch:              big.NewInt(0),
+		IstanbulEpoch:                 big.NewInt(0),
+		ReceiptLogEpoch:               big.NewInt(0),
+		SHA3Epoch:                     big.NewInt(0),
+		HIP6And8Epoch:                 EpochTBD, // Never enable it for localnet as localnet has no external validator setup
+		StakingPrecompileEpoch:        big.NewInt(2),
+		ChainIdFixEpoch:               big.NewInt(0),
+		SlotsLimitedEpoch:             EpochTBD, // epoch to enable HIP-16
+		CrossShardXferPrecompileEpoch: big.NewInt(1),
+		AllowlistEpoch:                EpochTBD,
+		NonBeaconLeaderRotation:       EpochTBD,
+		FeeCollectEpoch:               big.NewInt(5),
 	}
 
 	// AllProtocolChanges ...
@@ -313,8 +307,7 @@ var (
 		big.NewInt(0),                      // SlotsLimitedEpoch
 		big.NewInt(1),                      // CrossShardXferPrecompileEpoch
 		big.NewInt(0),                      // AllowlistEpoch
-		big.NewInt(1),                      // LeaderRotationExternalNonBeaconLeaders
-		big.NewInt(1),                      // LeaderRotationExternalBeaconLeaders
+		big.NewInt(1),                      // LeaderRotationEpoch
 		big.NewInt(0),                      // FeeCollectEpoch
 	}
 
@@ -355,8 +348,7 @@ var (
 		big.NewInt(0),        // SlotsLimitedEpoch
 		big.NewInt(1),        // CrossShardXferPrecompileEpoch
 		big.NewInt(0),        // AllowlistEpoch
-		big.NewInt(1),        // LeaderRotationExternalNonBeaconLeaders
-		big.NewInt(1),        // LeaderRotationExternalBeaconLeaders
+		big.NewInt(1),        // LeaderRotationEpoch
 		big.NewInt(0),        // FeeCollectEpoch
 	}
 
@@ -497,9 +489,7 @@ type ChainConfig struct {
 	// AllowlistEpoch is the first epoch to support allowlist of HIP18
 	AllowlistEpoch *big.Int
 
-	LeaderRotationExternalNonBeaconLeaders *big.Int `json:"non-beacon-leader-rotation-epoch,omitempty"`
-
-	LeaderRotationExternalBeaconLeaders *big.Int `json:"non-beacon-leader-rotation-epoch,omitempty"`
+	NonBeaconLeaderRotation *big.Int `json:"non-beacon-leader-rotation-epoch,omitempty"`
 
 	// FeeCollectEpoch is the first epoch that enables txn fees to be collected into the community-managed account.
 	// It should >= StakingEpoch.
@@ -707,18 +697,8 @@ func (c *ChainConfig) IsAllowlistEpoch(epoch *big.Int) bool {
 	return isForked(c.AllowlistEpoch, epoch)
 }
 
-func (c *ChainConfig) IsLeaderRotation(epoch *big.Int) bool {
-	return isForked(c.LeaderRotationExternalNonBeaconLeaders, epoch)
-}
-
-func (c *ChainConfig) IsLeaderRotationExternalValidatorsAllowed(epoch *big.Int, shardID uint32) bool {
-	if !c.IsLeaderRotation(epoch) {
-		return false
-	}
-	if shardID == 0 {
-		return isForked(c.LeaderRotationExternalBeaconLeaders, epoch)
-	}
-	return true
+func (c *ChainConfig) IsNonBeaconLeaderRotation(epoch *big.Int) bool {
+	return isForked(c.NonBeaconLeaderRotation, epoch)
 }
 
 // IsFeeCollectEpoch determines whether Txn Fees will be collected into the community-managed account.