diff --git a/Cargo.toml b/Cargo.toml
index 09ac0b8..748e6e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,32 +13,32 @@ version = '1.0.188'
 [dev-dependencies.sp-state-machine]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.sp-core]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.sp-io]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.sp-runtime]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.sp-std]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.sp-staking]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.log]
 default-features = false
@@ -54,23 +54,23 @@ version = '3.0.0'
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
 optional = true
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.frame-support]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.frame-system]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.pallet-session]
 default-features = false
 features = ['historical']
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [dependencies.scale-info]
 default-features = false
@@ -80,7 +80,7 @@ version = '2.1.1'
 [dependencies.sp-weights]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 
 [features]
 default = ['std']
diff --git a/docs/im-online-integration.md b/docs/im-online-integration.md
index 09b7fa2..90b323a 100644
--- a/docs/im-online-integration.md
+++ b/docs/im-online-integration.md
@@ -12,7 +12,7 @@
 [dependencies.pallet-im-online]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 ```
 
 ```toml
@@ -150,7 +150,7 @@ construct_runtime!(
 [dependencies.pallet-im-online]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 ```
 
 * Import `ImOnlineId` in the `chain_spec.rs`.
diff --git a/readme.md b/readme.md
index 2cc0425..75e4eb9 100644
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,7 @@
 
 A [Substrate](https://github.com/paritytech/polkadot-sdk/tree/master/substrate#substrate) pallet to add/remove authorities/validators in PoA networks.
 
-**Note: Current master is compatible with Substrate [polkadot-v1.1.0](https://github.com/paritytech/polkadot-sdk/tree/polkadot-v1.1.0) branch. For older versions, please see releases/tags.**
+**Note: Current master is compatible with Substrate [polkadot-v1.8.0](https://github.com/paritytech/polkadot-sdk/tree/polkadot-v1.8.0) branch. For older versions, please see releases/tags.**
 
 ## Setup with Substrate Node Template
 
@@ -22,7 +22,7 @@ version = '1.1.0'
 [dependencies.pallet-session]
 default-features = false
 git = 'https://github.com/paritytech/polkadot-sdk.git'
-tag = 'polkadot-v1.1.0'
+tag = 'polkadot-v1.8.0'
 ```
 
 ```toml
diff --git a/src/mock.rs b/src/mock.rs
index 128b605..64d049c 100644
--- a/src/mock.rs
+++ b/src/mock.rs
@@ -4,7 +4,7 @@
 
 use super::*;
 use crate as validator_set;
-use frame_support::parameter_types;
+use frame_support::{derive_impl, parameter_types};
 use frame_system::EnsureRoot;
 use pallet_session::*;
 use sp_core::{crypto::key_types::DUMMY, H256};
@@ -147,6 +147,7 @@ parameter_types! {
 		frame_system::limits::BlockWeights::simple_max(frame_support::weights::Weight::from_parts(1024, 0));
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type BlockWeights = ();