diff --git a/common/default_chains_mainnet.go b/common/default_chains_mainnet.go
index 62b455e571..170aaf245d 100644
--- a/common/default_chains_mainnet.go
+++ b/common/default_chains_mainnet.go
@@ -1,6 +1,3 @@
-//go:build !PRIVNET && !TESTNET && !MOCK_MAINNET
-// +build !PRIVNET,!TESTNET,!MOCK_MAINNET
-
 package common
 
 func EthChain() Chain {
@@ -24,6 +21,27 @@ func ZetaChain() Chain {
 	}
 }
 
+func ZetaTestnetChain() Chain {
+	return Chain{
+		ChainName: ChainName_zeta_testnet,
+		ChainId:   7001,
+	}
+}
+
+func ZetaMocknetChain() Chain {
+	return Chain{
+		ChainName: ChainName_zeta_mainnet,
+		ChainId:   70000,
+	}
+}
+
+func ZetaPrivnetChain() Chain {
+	return Chain{
+		ChainName: ChainName_zeta_mainnet,
+		ChainId:   101,
+	}
+}
+
 func BtcMainnetChain() Chain {
 	return Chain{
 		ChainName: ChainName_btc_mainnet,
@@ -46,6 +64,20 @@ func PolygonChain() Chain {
 	}
 }
 
+func BtcRegtestChain() Chain {
+	return Chain{
+		ChainName: ChainName_btc_regtest,
+		ChainId:   18444,
+	}
+}
+
+func GoerliChain() Chain {
+	return Chain{
+		ChainName: ChainName_goerli_localnet,
+		ChainId:   1337,
+	}
+}
+
 func DefaultChainsList() []*Chain {
 	chains := []Chain{
 		BtcMainnetChain(),
diff --git a/x/observer/types/core_params_mainnet.go b/x/observer/types/core_params_mainnet.go
index 38ab439aab..1f2af59ad4 100644
--- a/x/observer/types/core_params_mainnet.go
+++ b/x/observer/types/core_params_mainnet.go
@@ -1,6 +1,3 @@
-//go:build !PRIVNET && !TESTNET && !MOCK_MAINNET
-// +build !PRIVNET,!TESTNET,!MOCK_MAINNET
-
 package types
 
 import (
diff --git a/x/observer/types/core_params_privnet.go b/x/observer/types/core_params_privnet.go
index 832bf57475..27b5a1d6fa 100644
--- a/x/observer/types/core_params_privnet.go
+++ b/x/observer/types/core_params_privnet.go
@@ -38,7 +38,8 @@ func GetCoreParams() CoreParamsList {
 				OutTxTicker:                 2,
 				OutboundTxScheduleInterval:  2,
 				OutboundTxScheduleLookahead: 5,
-			}},
+			},
+		},
 	}
 	chainList := common.ExternalChainList()
 	requiredParams := len(chainList)