diff --git a/.maintain/config/task-pangolin-pangoro.toml b/.maintain/config/task-pangolin-pangoro.toml
index 16d3d0ec8..2c5527200 100644
--- a/.maintain/config/task-pangolin-pangoro.toml
+++ b/.maintain/config/task-pangolin-pangoro.toml
@@ -41,15 +41,15 @@ no_prometheus = false
 prometheus_host = "127.0.0.1"
 prometheus_port = 9616
 
-[pangolin_subscan]
-endpoint = "https://pangolin.api.subscan.io"
-token = "12345abcde"
-timeout = 30
-
-[pangoro_subscan]
-endpoint = "https://pangoro.api.subscan.io"
-token = "12345abcde"
-timeout = 30
+#[pangolin_subscan]
+#endpoint = "https://pangolin.api.subscan.io"
+#token = "12345abcde"
+#timeout = 30
+#
+#[pangoro_subscan]
+#endpoint = "https://pangoro.api.subscan.io"
+#token = "12345abcde"
+#timeout = 30
 
 [task]
 # 1800 seconds, 30 minutes
diff --git a/Cargo.lock b/Cargo.lock
index c65b951aa..d32abff21 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -622,7 +622,7 @@ dependencies = [
 [[package]]
 name = "bp-header-chain"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "finality-grandpa",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -637,7 +637,7 @@ dependencies = [
 [[package]]
 name = "bp-message-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "bp-runtime",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -648,7 +648,7 @@ dependencies = [
 [[package]]
 name = "bp-messages"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "bitvec",
  "bp-runtime",
@@ -663,7 +663,7 @@ dependencies = [
 [[package]]
 name = "bp-runtime"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
  "hash-db",
@@ -680,7 +680,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "bp-header-chain",
  "ed25519-dalek",
@@ -709,7 +709,7 @@ dependencies = [
 [[package]]
 name = "bridge-primitives"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -727,7 +727,7 @@ dependencies = [
 [[package]]
 name = "bridge-runtime-common"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "bp-message-dispatch",
  "bp-messages",
@@ -776,7 +776,7 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 [[package]]
 name = "bsc-primitives"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "ethbloom",
@@ -1009,7 +1009,7 @@ dependencies = [
 [[package]]
 name = "common-primitives"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "sp-core 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
  "sp-runtime 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -1486,7 +1486,7 @@ dependencies = [
 [[package]]
 name = "darwinia-balances"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-balances-rpc-runtime-api",
  "darwinia-support",
@@ -1502,7 +1502,7 @@ dependencies = [
 [[package]]
 name = "darwinia-balances-rpc-runtime-api"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-support",
  "parity-scale-codec",
@@ -1514,7 +1514,7 @@ dependencies = [
 [[package]]
 name = "darwinia-bridge-bsc"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "bsc-primitives",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -1529,7 +1529,7 @@ dependencies = [
 [[package]]
 name = "darwinia-bridge-ethereum"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "blake2-rfc",
@@ -1584,7 +1584,7 @@ dependencies = [
 [[package]]
 name = "darwinia-claims"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "darwinia-support",
@@ -1602,7 +1602,7 @@ dependencies = [
 [[package]]
 name = "darwinia-democracy"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-support",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -1617,7 +1617,7 @@ dependencies = [
 [[package]]
 name = "darwinia-elections-phragmen"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-support",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -1634,7 +1634,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "darwinia-balances",
@@ -1662,7 +1662,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm-precompile-bridge-ethereum"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-evm",
  "darwinia-evm-precompile-utils",
@@ -1678,7 +1678,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm-precompile-bridge-s2s"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "bp-message-dispatch",
  "bp-runtime",
@@ -1701,7 +1701,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm-precompile-dispatch"
 version = "2.6.8"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-evm",
  "darwinia-support",
@@ -1716,7 +1716,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm-precompile-simple"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "dp-evm",
  "evm",
@@ -1728,7 +1728,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm-precompile-transfer"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "darwinia-evm",
@@ -1753,7 +1753,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm-precompile-utils"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-evm-precompile-utils-macro",
  "darwinia-support",
@@ -1763,7 +1763,7 @@ dependencies = [
 [[package]]
 name = "darwinia-evm-precompile-utils-macro"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "evm",
  "proc-macro2",
@@ -1776,7 +1776,7 @@ dependencies = [
 [[package]]
 name = "darwinia-fee-market"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "bitvec",
  "bp-messages",
@@ -1799,7 +1799,7 @@ dependencies = [
 [[package]]
 name = "darwinia-fee-market-rpc-runtime-api"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "bp-messages",
  "parity-scale-codec",
@@ -1812,7 +1812,7 @@ dependencies = [
 [[package]]
 name = "darwinia-header-mmr"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "ckb-merkle-mountain-range",
  "darwinia-header-mmr-rpc-runtime-api",
@@ -1832,7 +1832,7 @@ dependencies = [
 [[package]]
 name = "darwinia-header-mmr-rpc-runtime-api"
 version = "2.6.6"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-support",
  "parity-scale-codec",
@@ -1845,7 +1845,7 @@ dependencies = [
 [[package]]
 name = "darwinia-relay-authorities"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-relay-primitives",
  "darwinia-support",
@@ -1860,7 +1860,7 @@ dependencies = [
 [[package]]
 name = "darwinia-relay-primitives"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
  "parity-scale-codec",
@@ -1871,7 +1871,7 @@ dependencies = [
 [[package]]
 name = "darwinia-relayer-game"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-relay-primitives",
  "darwinia-support",
@@ -1886,7 +1886,7 @@ dependencies = [
 [[package]]
 name = "darwinia-staking"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-staking-rpc-runtime-api",
  "darwinia-support",
@@ -1910,7 +1910,7 @@ dependencies = [
 [[package]]
 name = "darwinia-staking-rpc-runtime-api"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-support",
  "parity-scale-codec",
@@ -1922,7 +1922,7 @@ dependencies = [
 [[package]]
 name = "darwinia-support"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -1944,7 +1944,7 @@ dependencies = [
 [[package]]
 name = "darwinia-vesting"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-support",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -2062,7 +2062,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 [[package]]
 name = "dp-asset"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "ethereum-primitives",
  "parity-scale-codec",
@@ -2073,7 +2073,7 @@ dependencies = [
 [[package]]
 name = "dp-consensus"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
@@ -2087,7 +2087,7 @@ dependencies = [
 [[package]]
 name = "dp-contract"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "dp-asset",
  "ethabi 13.0.0",
@@ -2099,7 +2099,7 @@ dependencies = [
 [[package]]
 name = "dp-evm"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "evm",
  "impl-trait-for-tuples",
@@ -2112,7 +2112,7 @@ dependencies = [
 [[package]]
 name = "dp-fee"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "bp-messages",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -2124,7 +2124,7 @@ dependencies = [
 [[package]]
 name = "dp-s2s"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "bp-message-dispatch",
@@ -2140,7 +2140,7 @@ dependencies = [
 [[package]]
 name = "dp-storage"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 
 [[package]]
 name = "dtoa"
@@ -2151,7 +2151,7 @@ checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 [[package]]
 name = "dvm-ethereum"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-evm",
  "darwinia-support",
@@ -2180,7 +2180,7 @@ dependencies = [
 [[package]]
 name = "dvm-rpc-runtime-api"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-evm",
  "darwinia-support",
@@ -2410,7 +2410,7 @@ dependencies = [
 [[package]]
 name = "ethereum-primitives"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "ethash",
@@ -2558,7 +2558,7 @@ dependencies = [
 [[package]]
 name = "finality-relay"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "anyhow",
  "async-std",
@@ -2909,7 +2909,7 @@ dependencies = [
 [[package]]
 name = "from-ethereum-issuing"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "darwinia-bridge-ethereum",
@@ -2933,7 +2933,7 @@ dependencies = [
 [[package]]
 name = "from-substrate-issuing"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "bp-message-dispatch",
@@ -3309,7 +3309,7 @@ dependencies = [
 [[package]]
 name = "headers-relay"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4766,7 +4766,7 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882"
 [[package]]
 name = "merkle-patricia-trie"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "hashbrown 0.9.1",
  "keccak-hash",
@@ -4789,7 +4789,7 @@ dependencies = [
 [[package]]
 name = "messages-relay"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4880,7 +4880,7 @@ dependencies = [
 [[package]]
 name = "module-transaction-pause"
 version = "2.0.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
  "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -5274,7 +5274,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-dispatch"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "bp-message-dispatch",
  "bp-runtime",
@@ -5290,7 +5290,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -5311,7 +5311,7 @@ dependencies = [
 [[package]]
 name = "pallet-bridge-messages"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "bitvec",
  "bp-message-dispatch",
@@ -5728,7 +5728,7 @@ dependencies = [
 [[package]]
 name = "pangolin-constants"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "common-primitives",
  "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -5737,7 +5737,7 @@ dependencies = [
 [[package]]
 name = "pangolin-runtime"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "bp-message-dispatch",
@@ -5851,7 +5851,7 @@ dependencies = [
 [[package]]
 name = "pangolin-runtime-system-params"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
  "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -5862,7 +5862,7 @@ dependencies = [
 [[package]]
 name = "pangoro-constants"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "common-primitives",
  "sp-staking 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -5871,7 +5871,7 @@ dependencies = [
 [[package]]
 name = "pangoro-runtime"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "bp-header-chain",
@@ -5947,7 +5947,7 @@ dependencies = [
 [[package]]
 name = "pangoro-runtime-system-params"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
  "frame-system 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
@@ -6779,7 +6779,7 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 [[package]]
 name = "relay-substrate-client"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6815,7 +6815,7 @@ dependencies = [
 [[package]]
 name = "relay-utils"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "ansi_term 0.12.1",
  "anyhow",
@@ -9292,7 +9292,7 @@ dependencies = [
 [[package]]
 name = "substrate-relay-helper"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/parity-bridges-common.git?branch=darwinia-feemarket-strategy#e5adfc130cc301718f76775a4d50013011df6344"
+source = "git+https://github.com/darwinia-network/parity-bridges-common.git?tag=darwinia-v0.11.6-3#e26d59105acb795161881e49eb14992b8b0c22fa"
 dependencies = [
  "anyhow",
  "async-std",
@@ -9808,7 +9808,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 [[package]]
 name = "to-ethereum-backing"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "darwinia-relay-primitives",
@@ -9829,7 +9829,7 @@ dependencies = [
 [[package]]
 name = "to-substrate-backing"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "array-bytes",
  "bp-message-dispatch",
@@ -9855,7 +9855,7 @@ dependencies = [
 [[package]]
 name = "to-tron-backing"
 version = "2.6.10"
-source = "git+https://github.com/darwinia-network/darwinia-common.git?branch=s2s#92f7d1e98562391e914dc165a65572908294186d"
+source = "git+https://github.com/darwinia-network/darwinia-common.git?tag=v2.6.10-2#fb133f6e31b84ec83f6c16eb012634631638af5a"
 dependencies = [
  "darwinia-support",
  "frame-support 3.0.0 (git+https://github.com/darwinia-network/substrate.git?tag=darwinia-v0.11.6-1)",
diff --git a/components/client-pangolin-s2s/Cargo.toml b/components/client-pangolin-s2s/Cargo.toml
index 91037035a..9d79d43cd 100644
--- a/components/client-pangolin-s2s/Cargo.toml
+++ b/components/client-pangolin-s2s/Cargo.toml
@@ -25,20 +25,20 @@ log = "0.4"
 bridge-traits = { path = "../../traits" }
 
 codec                  = { package = "parity-scale-codec", version = "2.0.0" }
-headers-relay          = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-relay-utils            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-messages-relay         = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-bp-messages            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-bp-runtime             = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
+headers-relay          = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+relay-utils            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+messages-relay         = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+bp-messages            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+bp-runtime             = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
 
 ## Bridge dependencies
-pangolin-runtime         = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-common-primitives        = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-bridge-primitives        = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-pangolin-constants       = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-dp-fee                   = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
+pangolin-runtime         = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+common-primitives        = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+bridge-primitives        = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+darwinia-bridge-ethereum = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+pangolin-constants       = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+dp-fee                   = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
 
 
 
diff --git a/components/client-pangoro-s2s/Cargo.toml b/components/client-pangoro-s2s/Cargo.toml
index b95adcfc8..2d47ae60b 100644
--- a/components/client-pangoro-s2s/Cargo.toml
+++ b/components/client-pangoro-s2s/Cargo.toml
@@ -25,20 +25,20 @@ log = "0.4"
 bridge-traits = { path = "../../traits" }
 
 codec                  = { package = "parity-scale-codec", version = "2.0.0" }
-headers-relay          = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-relay-utils            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-messages-relay         = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-bp-messages            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-bp-runtime             = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
+headers-relay          = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+relay-utils            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+messages-relay         = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+bp-messages            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+bp-runtime             = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
 
 
 ## Bridge dependencies
-pangoro-runtime         = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-common-primitives       = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-bridge-primitives       = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-pangoro-constants       = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-dp-fee                  = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
+pangoro-runtime         = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+common-primitives       = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+bridge-primitives       = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+pangoro-constants       = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+dp-fee                  = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
 
 
 
diff --git a/task/task-pangolin-pangoro/Cargo.toml b/task/task-pangolin-pangoro/Cargo.toml
index 0b0133376..a78f38626 100644
--- a/task/task-pangolin-pangoro/Cargo.toml
+++ b/task/task-pangolin-pangoro/Cargo.toml
@@ -47,15 +47,15 @@ sp-version          = { git = "https://github.com/darwinia-network/substrate.git
 
 ## bridge common
 
-bp-runtime             = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-bp-messages            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-bp-header-chain        = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-substrate-relay-helper = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-relay-utils            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-bridge-runtime-common  = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-pallet-bridge-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
-messages-relay         = { git = "https://github.com/darwinia-network/parity-bridges-common.git", branch = "darwinia-feemarket-strategy" }
+bp-runtime             = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+bp-messages            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+bp-header-chain        = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+relay-substrate-client = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+substrate-relay-helper = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+relay-utils            = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+bridge-runtime-common  = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+pallet-bridge-messages = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
+messages-relay         = { git = "https://github.com/darwinia-network/parity-bridges-common.git", tag = "darwinia-v0.11.6-3" }
 
 
 ## component
@@ -64,16 +64,16 @@ component-pangoro-s2s  = { path = "../../components/client-pangoro-s2s" }
 component-subscan      = { path = "../../components/subscan" }
 
 ## darwinia common
-common-primitives   = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-bridge-primitives   = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
+common-primitives   = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+bridge-primitives   = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
 
 ## pangolin
-pangolin-runtime               = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-pangolin-runtime-system-params = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-pangolin-constants             = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
+pangolin-runtime               = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+pangolin-runtime-system-params = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+pangolin-constants             = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
 
 ## pangoro
-pangoro-runtime                = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-pangoro-runtime-system-params  = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
-pangoro-constants              = { git = "https://github.com/darwinia-network/darwinia-common.git", branch = "s2s" }
+pangoro-runtime                = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+pangoro-runtime-system-params  = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }
+pangoro-constants              = { git = "https://github.com/darwinia-network/darwinia-common.git", tag = "v2.6.10-2" }