diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
index 187331d688..7eb48292f5 100644
--- a/node/service/Cargo.toml
+++ b/node/service/Cargo.toml
@@ -33,7 +33,7 @@ pangolin-runtime                  = { path = "../runtime/pangolin" }
 pangoro-runtime                   = { path = "../runtime/pangoro" }
 # paritytech
 # beefy-gadget                               = { git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.3" }
-# beefy-primitives                           = { git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.3" }
+beefy-primitives                           = { git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.3" }
 frame-benchmarking                         = { git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.3" }
 frame-system-rpc-runtime-api               = { git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.3" }
 pallet-im-online                           = { git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.3" }
diff --git a/node/service/src/chain_spec/pangolin.rs b/node/service/src/chain_spec/pangolin.rs
index 3d2d35f5da..53fcf07fe0 100644
--- a/node/service/src/chain_spec/pangolin.rs
+++ b/node/service/src/chain_spec/pangolin.rs
@@ -122,7 +122,6 @@ pub fn genesis_config() -> ChainSpec {
 				authorities: vec![],
 				epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG)
 			},
-			beefy_gadget: Default::default(),
 			balances: BalancesConfig {
 				balances: vec![
 					(root.clone(), BUNCH_OF_COINS),
@@ -206,7 +205,8 @@ pub fn genesis_config() -> ChainSpec {
 					.collect(),
 			},
 			grandpa: Default::default(),
-			// beefy: Default::default(),
+			beefy: Default::default(),
+			// beefy_gadget: Default::default(),
 			im_online: Default::default(),
 			authority_discovery: Default::default(),
 			democracy: Default::default(),
@@ -359,7 +359,6 @@ pub fn development_config() -> ChainSpec {
 				authorities: vec![],
 				epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG)
 			},
-			beefy_gadget: Default::default(),
 			balances: BalancesConfig {
 				balances: endowed_accounts
 					.clone()
@@ -396,7 +395,8 @@ pub fn development_config() -> ChainSpec {
 					.collect(),
 			},
 			grandpa: Default::default(),
-			// beefy: Default::default(),
+			beefy: Default::default(),
+			// beefy_gadget: Default::default(),
 			im_online: Default::default(),
 			authority_discovery: Default::default(),
 			democracy: Default::default(),
@@ -552,7 +552,6 @@ pub fn local_testnet_config() -> ChainSpec {
 				authorities: vec![],
 				epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG)
 			},
-			beefy_gadget: Default::default(),
 			balances: BalancesConfig {
 				balances: endowed_accounts
 					.clone()
@@ -589,7 +588,8 @@ pub fn local_testnet_config() -> ChainSpec {
 					.collect(),
 			},
 			grandpa: Default::default(),
-			// beefy: Default::default(),
+			beefy: Default::default(),
+			// beefy_gadget: Default::default(),
 			im_online: Default::default(),
 			authority_discovery: Default::default(),
 			democracy: Default::default(),
diff --git a/node/service/src/chain_spec/pangoro.rs b/node/service/src/chain_spec/pangoro.rs
index fb693e7526..e939e63e04 100644
--- a/node/service/src/chain_spec/pangoro.rs
+++ b/node/service/src/chain_spec/pangoro.rs
@@ -110,7 +110,6 @@ pub fn genesis_config() -> ChainSpec {
 				authorities: vec![],
 				epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
 			},
-			beefy_gadget: Default::default(),
 			balances: BalancesConfig {
 				balances: vec![
 					(root.clone(), BUNCH_OF_COINS),
@@ -213,7 +212,8 @@ pub fn genesis_config() -> ChainSpec {
 					.collect(),
 			},
 			grandpa: Default::default(),
-			// beefy: Default::default(),
+			beefy: Default::default(),
+			// beefy_gadget: Default::default(),
 			im_online: Default::default(),
 			authority_discovery: Default::default(),
 			treasury: Default::default(),
@@ -314,7 +314,6 @@ pub fn development_config() -> ChainSpec {
 				authorities: vec![],
 				epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
 			},
-			beefy_gadget: Default::default(),
 			balances: BalancesConfig {
 				balances: endowed_accounts
 					.clone()
@@ -351,7 +350,8 @@ pub fn development_config() -> ChainSpec {
 					.collect(),
 			},
 			grandpa: Default::default(),
-			// beefy: Default::default(),
+			beefy: Default::default(),
+			// beefy_gadget: Default::default(),
 			im_online: Default::default(),
 			authority_discovery: Default::default(),
 			treasury: Default::default(),
diff --git a/node/service/src/service/api.rs b/node/service/src/service/api.rs
index a48c6cfd79..4dad64cc4b 100644
--- a/node/service/src/service/api.rs
+++ b/node/service/src/service/api.rs
@@ -25,7 +25,7 @@ impl_runtime_apis![
 	sp_session::SessionKeys<Block>,
 	sp_consensus_babe::BabeApi<Block>,
 	sp_finality_grandpa::GrandpaApi<Block>,
-	beefy_primitives::BeefyApi<Block>,
+	// beefy_primitives::BeefyApi<Block>,
 	sp_authority_discovery::AuthorityDiscoveryApi<Block>,
 	sp_offchain::OffchainWorkerApi<Block>,
 	sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,
diff --git a/node/service/src/service/dvm.rs b/node/service/src/service/dvm.rs
index 0b53e6cd9e..6da57ca234 100644
--- a/node/service/src/service/dvm.rs
+++ b/node/service/src/service/dvm.rs
@@ -113,6 +113,8 @@ where
 					client.clone(),
 					substrate_backend.clone(),
 					dvm_backend.clone(),
+					3,
+					0,
 					SyncStrategy::Normal,
 				)
 				.for_each(|_| futures::future::ready(())),
diff --git a/node/service/src/service/mod.rs b/node/service/src/service/mod.rs
index 378fdeecfd..da08bdf1f7 100644
--- a/node/service/src/service/mod.rs
+++ b/node/service/src/service/mod.rs
@@ -148,7 +148,7 @@ where
 	let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
 
 	config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());
-	config.network.extra_sets.push(beefy_gadget::beefy_peers_set_config());
+	// config.network.extra_sets.push(beefy_gadget::beefy_peers_set_config());
 
 	let backoff_authoring_blocks =
 		Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default());