diff --git a/Cargo.lock b/Cargo.lock
index 58ae5d33..7cf79688 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3965,6 +3965,7 @@ dependencies = [
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
  "cumulus-primitives-timestamp",
  "cumulus-primitives-utility",
  "frame-benchmarking",
@@ -4008,6 +4009,8 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "polkadot-parachain",
+ "polkadot-primitives",
+ "polkadot-runtime-parachains",
  "scale-info",
  "sp-api",
  "sp-block-builder",
diff --git a/polkadot-parachains/common/Cargo.toml b/polkadot-parachains/common/Cargo.toml
index 18d384fb..75cd967a 100644
--- a/polkadot-parachains/common/Cargo.toml
+++ b/polkadot-parachains/common/Cargo.toml
@@ -37,10 +37,6 @@ polkadot-runtime-common = { default-features = false, git = "https://github.com/
 xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
 xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
 
-[dev-dependencies]
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-
 [build-dependencies]
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
 
@@ -48,17 +44,21 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
 default = ["std"]
 std = [
     "codec/std",
-    "scale-info/std",
-    "sp-consensus-aura/std",
-    "sp-std/std",
-    "sp-io/std",
-    "frame-support/std",
     "frame-executive/std",
+    "frame-support/std",
     "frame-system/std",
     "pallet-assets/std",
     "pallet-authorship/std",
     "pallet-balances/std",
     "polkadot-core-primitives/std",
-    "polkadot-runtime-common/std",
     "polkadot-primitives/std",
+    "polkadot-runtime-common/std",
+    "scale-info/std",
+    "sp-consensus-aura/std",
+    "sp-core/std",
+    "sp-io/std",
+    "sp-runtime/std",
+    "sp-std/std",
+    "xcm-executor/std",
+    "xcm/std",
 ]
diff --git a/polkadot-parachains/integritee-runtime/Cargo.toml b/polkadot-parachains/integritee-runtime/Cargo.toml
index 8c3a3add..70265f06 100644
--- a/polkadot-parachains/integritee-runtime/Cargo.toml
+++ b/polkadot-parachains/integritee-runtime/Cargo.toml
@@ -96,6 +96,10 @@ hex-literal = { version = "0.3.4", optional = true }
 [dev-dependencies]
 hex-literal = "0.3.4"
 hex = "0.4.3"
+cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus', branch = "polkadot-v0.9.42" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
+
 
 [build-dependencies]
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
@@ -104,68 +108,67 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
 default = ["std"]
 std = [
     "codec/std",
-    "log/std",
-    "scale-info/std",
-    "sp-api/std",
-    "sp-std/std",
-    "sp-io/std",
-    "sp-core/std",
-    "sp-runtime/std",
-    "sp-version/std",
-    "sp-offchain/std",
-    "sp-session/std",
-    "sp-block-builder/std",
-    "sp-transaction-pool/std",
-    "sp-inherents/std",
-    "frame-support/std",
+    "cumulus-pallet-aura-ext/std",
+    "cumulus-pallet-dmp-queue/std",
+    "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-xcm/std",
+    "cumulus-pallet-xcmp-queue/std",
+    "cumulus-primitives-core/std",
+    "cumulus-primitives-timestamp/std",
+    "cumulus-primitives-utility/std",
     "frame-executive/std",
-    "frame-system/std",
+    "frame-support/std",
     "frame-system-rpc-runtime-api/std",
+    "frame-system/std",
     "frame-try-runtime/std",
+    "log/std",
+    "orml-traits/std",
+    "orml-xcm-support/std",
+    "orml-xcm/std",
+    "orml-xtokens/std",
     "pallet-aura/std",
     "pallet-balances/std",
     "pallet-bounties/std",
     "pallet-child-bounties/std",
+    "pallet-claims/std",
     "pallet-collective/std",
     "pallet-democracy/std",
-    "pallet-timestamp/std",
-    "pallet-treasury/std",
-    "pallet-transaction-payment/std",
-    "pallet-transaction-payment-rpc-runtime-api/std",
-    "pallet-vesting/std",
+    "pallet-enclave-bridge/std",
     "pallet-multisig/std",
-    "pallet-proxy/std",
     "pallet-preimage/std",
+    "pallet-proxy/std",
     "pallet-scheduler/std",
+    "pallet-sidechain/std",
+    "pallet-teeracle/std",
+    "pallet-teerex/std",
+    "pallet-timestamp/std",
+    "pallet-transaction-payment-rpc-runtime-api/std",
+    "pallet-transaction-payment/std",
+    "pallet-treasury/std",
     "pallet-utility/std",
-    "pallet-xcm/std",
+    "pallet-vesting/std",
     "pallet-xcm-transactor/std",
+    "pallet-xcm/std",
     "parachain-info/std",
     "parachains-common/std",
-    "cumulus-pallet-aura-ext/std",
-    "cumulus-pallet-dmp-queue/std",
-    "cumulus-pallet-parachain-system/std",
-    "cumulus-pallet-xcmp-queue/std",
-    "cumulus-pallet-xcm/std",
-    "cumulus-primitives-core/std",
-    "cumulus-primitives-timestamp/std",
-    "cumulus-primitives-utility/std",
-    "xcm/std",
+    "polkadot-parachain/std",
+    "scale-info/std",
+    "sp-api/std",
+    "sp-block-builder/std",
+    "sp-consensus-aura/std",
+    "sp-core/std",
+    "sp-inherents/std",
+    "sp-io/std",
+    "sp-offchain/std",
+    "sp-runtime/std",
+    "sp-session/std",
+    "sp-std/std",
+    "sp-transaction-pool/std",
+    "sp-version/std",
     "xcm-builder/std",
     "xcm-executor/std",
     "xcm-transactor-primitives/std",
-    "sp-consensus-aura/std",
-    # orml
-    "orml-xtokens/std",
-    "orml-traits/std",
-    "orml-xcm-support/std",
-    "orml-xcm/std",
-    # Integritee
-    "pallet-claims/std",
-    "pallet-sidechain/std",
-    "pallet-teeracle/std",
-    "pallet-teerex/std",
-    "pallet-enclave-bridge/std",
+    "xcm/std",
 ]
 runtime-benchmarks = [
     # support stuff
diff --git a/polkadot-parachains/integritee-runtime/src/lib.rs b/polkadot-parachains/integritee-runtime/src/lib.rs
index 15f72999..07308cd7 100644
--- a/polkadot-parachains/integritee-runtime/src/lib.rs
+++ b/polkadot-parachains/integritee-runtime/src/lib.rs
@@ -64,11 +64,12 @@ use frame_system::{
 };
 
 pub use parachains_common as common;
-pub use parachains_common::MILLISECS_PER_BLOCK;
 use parachains_common::{
-	opaque, AccountId, AuraId, Balance, BlockNumber, Hash, Header, Index, Signature,
-	AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO,
-	SLOT_DURATION,
+	opaque, AuraId, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MINUTES,
+	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
+};
+pub use parachains_common::{
+	AccountId, Balance, BlockNumber, Hash, Header, Index, Signature, MILLISECS_PER_BLOCK,
 };
 
 pub use pallet_balances::Call as BalancesCall;