diff --git a/changelog.md b/changelog.md
index d3f774081d..18d52c993f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -29,6 +29,8 @@
 * [2210](https://github.com/zeta-chain/node/pull/2210) - removed uncessary panics in the zetaclientd process
 * [2205](https://github.com/zeta-chain/node/pull/2205) - remove deprecated variables pre-v17
 * [2226](https://github.com/zeta-chain/node/pull/2226) - improve Go formatting with imports standardization and max line length to 120
+* [](https://github.com/zeta-chain/node/pull/2269) - refactor MsgUpdateCrosschainFlags into MsgEnableCCTXFlags, MsgDisableCCTXFlags and MsgUpdateGasPriceIncreaseFlags
+
 
 ### Tests
 
diff --git a/docs/releases/v17_breaking_changes.md b/docs/releases/v17_breaking_changes.md
index b1598cbf9b..fecdc46e42 100644
--- a/docs/releases/v17_breaking_changes.md
+++ b/docs/releases/v17_breaking_changes.md
@@ -6,6 +6,10 @@
 * `MsgUpdateVerificationFlags` has been removed, and replaced with `MsgEnableHeaderVerification` and `MsgDisableHeaderVerification` messages.
     * `MsgEnableHeaderVerification` message enables block header verification for a list of chains and can be triggered via `PolicyType_groupOperational`
     * `MsgDisableHeaderVerification` message disables block header verification for a list of chains and can be triggered via `PolicyType_emergency`
+* `MsgUpdateCrosschainFlags` has been removed,and replaced with `MsgEnableCCTXFlags`, `MsgDisableCCTXFlags` and `MsgUpdateGasPriceIncreaseFlags` messages.
+    * `MsgEnableCCTXFlags` message enables either the IsInboundEnabled flag, or the IsOutboundEnabled flag or both `PolicyType_groupOperational`
+    * `MsgDisableCCTXFlags` message disables either the IsInboundEnabled flag, or the IsOutboundEnabled flag or both `PolicyType_emergency`
+    * `MsgUpdateGasPriceIncreaseFlags` message updates the gas price increase flags and can be triggered via `PolicyType_groupOperational`
 
 ### `BallotMaturityBlocks` moved to `emissions` module
 
diff --git a/x/observer/client/cli/tx_update_gas_price_increase_flags.go b/x/observer/client/cli/tx_update_gas_price_increase_flags.go
index 34893a8b03..e2cc0a5685 100644
--- a/x/observer/client/cli/tx_update_gas_price_increase_flags.go
+++ b/x/observer/client/cli/tx_update_gas_price_increase_flags.go
@@ -45,11 +45,14 @@ func CmdUpdateGasPriceIncreaseFlags() *cobra.Command {
 				return err
 			}
 			gasPriceIncreaseFlags := types.GasPriceIncreaseFlags{
-				EpochLength:             epochLength,
-				RetryInterval:           time.Duration(retryInterval),
+				EpochLength:   epochLength,
+				RetryInterval: time.Duration(retryInterval),
+				// #nosec G701 bitsize set to 32
 				GasPriceIncreasePercent: uint32(gasPriceIncreasePercent),
-				GasPriceIncreaseMax:     uint32(gasPriceIncreaseMax),
-				MaxPendingCctxs:         uint32(maxPendingCctxs)}
+				// #nosec G701 bitsize set to 32
+				GasPriceIncreaseMax: uint32(gasPriceIncreaseMax),
+				// #nosec G701 bitsize set to 32
+				MaxPendingCctxs: uint32(maxPendingCctxs)}
 			msg := types.NewMsgUpdateGasPriceIncreaseFlags(clientCtx.GetFromAddress().String(), gasPriceIncreaseFlags)
 			err = msg.ValidateBasic()
 			if err != nil {