diff --git a/state-chain/pallets/cf-broadcast/src/lib.rs b/state-chain/pallets/cf-broadcast/src/lib.rs
index 45bffe73f85..a428a923919 100644
--- a/state-chain/pallets/cf-broadcast/src/lib.rs
+++ b/state-chain/pallets/cf-broadcast/src/lib.rs
@@ -83,7 +83,7 @@ pub enum PalletOffence {
 	FailedToBroadcastTransaction,
 }
 
-pub const PALLET_VERSION: StorageVersion = StorageVersion::new(1);
+pub const PALLET_VERSION: StorageVersion = StorageVersion::new(2);
 
 #[frame_support::pallet]
 pub mod pallet {
diff --git a/state-chain/pallets/cf-broadcast/src/migrations.rs b/state-chain/pallets/cf-broadcast/src/migrations.rs
index ebf1607f2c6..3eaa166e9bf 100644
--- a/state-chain/pallets/cf-broadcast/src/migrations.rs
+++ b/state-chain/pallets/cf-broadcast/src/migrations.rs
@@ -1,7 +1,6 @@
-pub mod add_initiated_at;
-pub mod v1;
+pub mod v2;
 
 use cf_runtime_upgrade_utilities::VersionedMigration;
 
 pub type PalletMigration<T, I> =
-	(VersionedMigration<crate::Pallet<T, I>, add_initiated_at::Migration<T, I>, 0, 1>,);
+	(VersionedMigration<crate::Pallet<T, I>, v2::Migration<T, I>, 1, 2>,);
diff --git a/state-chain/pallets/cf-broadcast/src/migrations/add_initiated_at.rs b/state-chain/pallets/cf-broadcast/src/migrations/add_initiated_at.rs
deleted file mode 100644
index af2811d5320..00000000000
--- a/state-chain/pallets/cf-broadcast/src/migrations/add_initiated_at.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use crate::*;
-#[cfg(feature = "try-runtime")]
-use frame_support::dispatch::DispatchError;
-use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};
-use sp_std::marker::PhantomData;
-
-mod old {
-	use frame_support::pallet_prelude::OptionQuery;
-
-	use super::*;
-
-	#[frame_support::storage_alias]
-	pub type TransactionOutIdToBroadcastId<T: Config<I>, I: 'static> =
-		StorageMap<Pallet<T, I>, Twox64Concat, TransactionOutIdFor<T, I>, BroadcastId, OptionQuery>;
-}
-
-pub struct Migration<T: Config<I>, I: 'static>(PhantomData<(T, I)>);
-
-impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for Migration<T, I> {
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		let chain_height = T::ChainTracking::get_block_height();
-
-		TransactionOutIdToBroadcastId::<T, I>::translate::<BroadcastId, _>(|_id, old| {
-			Some((old, chain_height))
-		});
-
-		Weight::zero()
-	}
-
-	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<Vec<u8>, DispatchError> {
-		use frame_support::ensure;
-
-		let chain_height = T::ChainTracking::get_block_height();
-		// If it's at 0 something went wrong with the initialisation. Also since initiated_at is the
-		// last thing being decoded, this acts as a check that the rest of the decoding worked.
-		ensure!(chain_height > 0u32.into(), "chain_height is 0");
-		Ok(chain_height.encode())
-	}
-
-	#[cfg(feature = "try-runtime")]
-	fn post_upgrade(state: Vec<u8>) -> Result<(), DispatchError> {
-		use frame_support::ensure;
-
-		let pre_upgrade_height = ChainBlockNumberFor::<T, I>::decode(&mut &state[..])
-			.map_err(|_| "Failed to decode pre-upgrade state.")?;
-
-		for (_out_id, (_b_id, initiated_at)) in TransactionOutIdToBroadcastId::<T, I>::iter() {
-			ensure!(initiated_at >= pre_upgrade_height, "initiated_at is 0");
-		}
-		Ok(())
-	}
-}
diff --git a/state-chain/pallets/cf-broadcast/src/migrations/v1.rs b/state-chain/pallets/cf-broadcast/src/migrations/v1.rs
deleted file mode 100644
index 42e61e45467..00000000000
--- a/state-chain/pallets/cf-broadcast/src/migrations/v1.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use crate::*;
-use frame_support::{migration, pallet_prelude::Weight, traits::OnRuntimeUpgrade};
-use sp_std::marker::PhantomData;
-
-pub struct Migration<T: Config<I>, I: 'static>(PhantomData<(T, I)>);
-
-impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for Migration<T, I> {
-	fn on_runtime_upgrade() -> frame_support::weights::Weight {
-		migration::move_storage_from_pallet(
-			Pallet::<T, I>::storage_metadata().prefix.as_bytes(),
-			b"RequestCallbacks",
-			b"RequestSuccessCallbacks",
-		);
-		Weight::zero()
-	}
-}
diff --git a/state-chain/pallets/cf-broadcast/src/migrations/v2.rs b/state-chain/pallets/cf-broadcast/src/migrations/v2.rs
new file mode 100644
index 00000000000..777a228249d
--- /dev/null
+++ b/state-chain/pallets/cf-broadcast/src/migrations/v2.rs
@@ -0,0 +1,53 @@
+use crate::*;
+use frame_support::{
+	migration,
+	pallet_prelude::Weight,
+	traits::{OnRuntimeUpgrade, PalletInfoAccess},
+	StoragePrefixedMap,
+};
+use sp_std::marker::PhantomData;
+
+mod old {
+	use super::*;
+	use frame_support::{pallet_prelude::OptionQuery, Twox64Concat};
+
+	#[frame_support::storage_alias]
+	pub type RequestCallbacks<T: Config<I>, I: 'static> = StorageMap<
+		Pallet<T, I>,
+		Twox64Concat,
+		BroadcastId,
+		<T as Config<I>>::BroadcastCallable,
+		OptionQuery,
+	>;
+}
+
+pub struct Migration<T: Config<I>, I: 'static>(PhantomData<(T, I)>);
+
+impl<T: Config<I>, I: 'static> OnRuntimeUpgrade for Migration<T, I> {
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		migration::move_prefix(
+			&frame_support::storage::storage_prefix(
+				Pallet::<T, I>::name().as_bytes(),
+				b"RequestCallbacks",
+			)[..],
+			RequestSuccessCallbacks::<T, I>::storage_prefix(),
+		);
+		Weight::zero()
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, frame_support::sp_runtime::TryRuntimeError> {
+		let count = old::RequestCallbacks::<T, I>::iter().count() as u32;
+		Ok(count.encode())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(state: Vec<u8>) -> Result<(), frame_support::sp_runtime::TryRuntimeError> {
+		let old_count = u32::decode(&mut &*state).expect("Invalid data passed from pre_upgrade");
+		frame_support::ensure!(
+			old_count == RequestSuccessCallbacks::<T, I>::iter().count() as u32,
+			"Count mismatch"
+		);
+		Ok(())
+	}
+}