diff --git a/CHANGELOG.md b/CHANGELOG.md
index b89aeb9cd8..9fa568828e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Upgrade to Polkadot-SDK `unstable2507` ([polkadot-fellows/runtimes/pull/849](https://github.com/polkadot-fellows/runtimes/pull/849))
   - [#7953](https://github.com/paritytech/polkadot-sdk/pull/7953): Add deposit for setting session keys
-    🚨 Setting session keys now charges a storage deposit for them. Validators should make sure they have some free balance to cover this deposit the next time they want to rotate their keys.
+    * 🚨 Setting session keys now might charge a storage deposit. The amount can be inspected in the Session::KeyDeposit of the runtime metadata. This value is intended to be set post AHM. Validators should make sure they have some free balance to cover this deposit the next time they want to rotate their keys.
+    * Session keys previously could be set only by the associated controller account of a stash. Now, this filter no longer exists, and they can be set by anyone (ergo, the deposit). For validators, please make sure to submit your session keys (henceforth) **from the stash account**.
 - Add foreign-consensus cousin Asset Hub as trusted aliaser to allow XCMv5 origin preservation for foreign-consensus parachains [polkadot-fellows/runtimes/pull/794](https://github.com/polkadot-fellows/runtimes/pull/794))
 - Configure block providers for pallets requiring block context ([polkadot-fellows/runtimes/pull/813](https://github.com/polkadot-fellows/runtimes/pull/813)):
   - vesting: keep using Relay Chain block provider
diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs
index d85fa70d9e..0145bee0e7 100644
--- a/relay/kusama/src/lib.rs
+++ b/relay/kusama/src/lib.rs
@@ -515,7 +515,8 @@ impl pallet_session::Config for Runtime {
 	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
 	type DisablingStrategy = pallet_session::disabling::UpToLimitWithReEnablingDisablingStrategy;
 	type Currency = Balances;
-	type KeyDeposit = KeyDeposit;
+	// TODO: we will set this post-AHM
+	type KeyDeposit = ();
 }
 
 impl pallet_session::historical::Config for Runtime {
diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs
index 019bdba044..0749f32682 100644
--- a/relay/polkadot/src/lib.rs
+++ b/relay/polkadot/src/lib.rs
@@ -492,7 +492,8 @@ impl pallet_session::Config for Runtime {
 	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
 	type DisablingStrategy = pallet_session::disabling::UpToLimitWithReEnablingDisablingStrategy;
 	type Currency = Balances;
-	type KeyDeposit = KeyDeposit;
+	// TODO: we will set this post-AHM
+	type KeyDeposit = ();
 }
 
 impl pallet_session::historical::Config for Runtime {
@@ -639,6 +640,15 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 
 parameter_types! {
 	pub const BagThresholds: &'static [u64] = &bag_thresholds::THRESHOLDS;
+}
+
+// TODO: remove feature gate and keep 10, when we want to activate it for Polkadot
+#[cfg(feature = "runtime-benchmarks")]
+parameter_types! {
+	pub const AutoRebagNumber: u32 = 10;
+}
+#[cfg(not(feature = "runtime-benchmarks"))]
+parameter_types! {
 	pub const AutoRebagNumber: u32 = 0;
 }