diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a6c1ce0ec..4a13fdac26 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -213,7 +213,7 @@ jobs:
   ####### This job must not be skipped (otherwise the ts-tests are not run)
 
   prepare-polkadot:
-    runs-on: ubuntu-latest
+    runs-on: bare-metal
     needs: ["set-tags"]
     steps:
       - name: Checkout
@@ -231,6 +231,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: index.docker.io
       - name: Check & build polkadot docker image
         run: |
           POLKADOT_REPO=${{ needs.set-tags.outputs.polkadot_repo }}
@@ -247,12 +248,12 @@ jobs:
         run: |
           POLKADOT_REPO=${{ needs.set-tags.outputs.polkadot_repo }}
           POLKADOT_COMMIT=${{ needs.set-tags.outputs.polkadot_commit }}
-          DOCKER_TAG="purestake/polkadot-para-tests:sha-$POLKADOT_COMMIT"
+          DOCKER_TAG="docker.io/purestake/polkadot-para-tests:sha-$POLKADOT_COMMIT"
           POLKADOT_EXISTS=$(docker manifest inspect $DOCKER_TAG > /dev/null && \
             echo "true" || echo "false")
           if [[ "$POLKADOT_EXISTS" == "false" ]]; then
             mkdir -p build
-            MOONBEAM_DOCKER_TAG="purestake/moonbase-relay-testnet:sha-$POLKADOT_COMMIT"
+            MOONBEAM_DOCKER_TAG="docker.io/purestake/moonbase-relay-testnet:sha-$POLKADOT_COMMIT"
             # Clear the dummy container if it wasn't properly cleaned up
             docker rm -f dummy 2> /dev/null | true
             docker create --pull always -ti --name dummy $MOONBEAM_DOCKER_TAG bash
diff --git a/Cargo.lock b/Cargo.lock
index 9f932072e3..130f982eab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4350,7 +4350,7 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
 [[package]]
 name = "kusama-runtime"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -4448,7 +4448,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime-constants"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -8862,7 +8862,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -8883,7 +8883,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9230,7 +9230,7 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
 [[package]]
 name = "polkadot-approval-distribution"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-metrics",
@@ -9245,7 +9245,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-network-protocol",
@@ -9259,7 +9259,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9282,7 +9282,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "fatality",
  "futures 0.3.28",
@@ -9303,7 +9303,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "clap",
  "frame-benchmarking-cli",
@@ -9330,7 +9330,7 @@ dependencies = [
 [[package]]
 name = "polkadot-client"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -9375,7 +9375,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "always-assert",
  "bitvec",
@@ -9397,7 +9397,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9409,7 +9409,7 @@ dependencies = [
 [[package]]
 name = "polkadot-dispute-distribution"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9434,7 +9434,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -9448,7 +9448,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "futures-timer",
@@ -9468,7 +9468,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -9491,7 +9491,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "parity-scale-codec",
@@ -9509,7 +9509,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -9538,7 +9538,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "futures 0.3.28",
@@ -9559,7 +9559,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9578,7 +9578,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-subsystem",
@@ -9593,7 +9593,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -9613,7 +9613,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-metrics",
@@ -9628,7 +9628,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-selection"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "futures-timer",
@@ -9645,7 +9645,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "fatality",
  "futures 0.3.28",
@@ -9664,7 +9664,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -9681,7 +9681,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9699,7 +9699,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -9735,7 +9735,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-checker"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "polkadot-node-primitives",
@@ -9751,7 +9751,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "futures 0.3.28",
  "lru 0.9.0",
@@ -9766,7 +9766,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "lazy_static",
  "log",
@@ -9784,7 +9784,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-metrics"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bs58",
  "futures 0.3.28",
@@ -9803,7 +9803,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9825,7 +9825,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bounded-vec",
  "futures 0.3.28",
@@ -9848,7 +9848,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -9858,7 +9858,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9881,7 +9881,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9914,7 +9914,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "futures 0.3.28",
@@ -9937,7 +9937,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bounded-collections",
  "derive_more",
@@ -9954,7 +9954,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "hex-literal",
@@ -9980,7 +9980,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "jsonrpsee",
  "mmr-rpc",
@@ -10012,7 +10012,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -10102,7 +10102,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -10148,7 +10148,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-constants"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -10162,7 +10162,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -10174,7 +10174,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitflags",
  "bitvec",
@@ -10218,7 +10218,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "async-trait",
  "frame-benchmarking-cli",
@@ -10330,7 +10330,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
@@ -10351,7 +10351,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -11099,7 +11099,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "binary-merkle-tree",
  "frame-benchmarking",
@@ -11185,7 +11185,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime-constants"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -13007,7 +13007,7 @@ dependencies = [
 [[package]]
 name = "slot-range-helper"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -14656,7 +14656,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-primitives",
@@ -14667,7 +14667,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum-proc-macro"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate",
@@ -15732,7 +15732,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -15824,7 +15824,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime-constants"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -16149,7 +16149,7 @@ dependencies = [
 [[package]]
 name = "xcm"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "bounded-collections",
  "derivative",
@@ -16165,7 +16165,7 @@ dependencies = [
 [[package]]
 name = "xcm-builder"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -16186,7 +16186,7 @@ dependencies = [
 [[package]]
 name = "xcm-executor"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -16232,7 +16232,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -16243,7 +16243,7 @@ dependencies = [
 [[package]]
 name = "xcm-simulator"
 version = "0.9.40"
-source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#923c10b6afadb5259b26fc06288201c5392d0144"
+source = "git+/~https://github.com/purestake/polkadot?branch=moonbeam-polkadot-v0.9.40#89fd916a027ea7fb4a1b0092d0259e7897b45a79"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
diff --git a/runtime/moonbase/src/xcm_config.rs b/runtime/moonbase/src/xcm_config.rs
index aacea234f4..7b611835a4 100644
--- a/runtime/moonbase/src/xcm_config.rs
+++ b/runtime/moonbase/src/xcm_config.rs
@@ -111,7 +111,7 @@ pub type LocationToAccountId = (
 	// If we receive a MultiLocation of type AccountKey20, just generate a native account
 	AccountKey20Aliases<RelayNetwork, AccountId>,
 	// Generate remote accounts according to polkadot standards
-	xcm_builder::ForeignChainAliasAccount<AccountId>,
+	xcm_builder::HashedDescriptionDescribeFamilyAllTerminal<AccountId>,
 );
 
 /// Wrapper type around `LocationToAccountId` to convert an `AccountId` to type `H160`.
diff --git a/runtime/moonbase/tests/integration_test.rs b/runtime/moonbase/tests/integration_test.rs
index fa37e05873..778e92ec30 100644
--- a/runtime/moonbase/tests/integration_test.rs
+++ b/runtime/moonbase/tests/integration_test.rs
@@ -3001,7 +3001,7 @@ fn test_xcm_utils_ml_tp_account() {
 			),
 		);
 		let expected_address_alice_in_parachain_2000: H160 =
-			xcm_builder::ForeignChainAliasAccount::<AccountId>::convert_ref(
+			xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::<AccountId>::convert_ref(
 				alice_in_parachain_2000_multilocation.clone(),
 			)
 			.unwrap()
diff --git a/runtime/moonbase/tests/xcm_mock/parachain.rs b/runtime/moonbase/tests/xcm_mock/parachain.rs
index 0230f5a829..b2d8e01270 100644
--- a/runtime/moonbase/tests/xcm_mock/parachain.rs
+++ b/runtime/moonbase/tests/xcm_mock/parachain.rs
@@ -182,7 +182,7 @@ pub type LocationToAccountId = (
 	SiblingParachainConvertsVia<Sibling, AccountId>,
 	AccountKey20Aliases<RelayNetwork, AccountId>,
 	// The rest of multilocations convert via hashing it
-	xcm_builder::ForeignChainAliasAccount<AccountId>,
+	xcm_builder::HashedDescriptionDescribeFamilyAllTerminal<AccountId>,
 );
 
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
diff --git a/runtime/moonbase/tests/xcm_tests.rs b/runtime/moonbase/tests/xcm_tests.rs
index 14c6b1b68a..522a5c8b3c 100644
--- a/runtime/moonbase/tests/xcm_tests.rs
+++ b/runtime/moonbase/tests/xcm_tests.rs
@@ -31,6 +31,7 @@ use pallet_xcm_transactor::{
 use sp_std::boxed::Box;
 use xcm::latest::prelude::*;
 use xcm::{VersionedMultiLocation, WrapVersion};
+use xcm_builder::HashedDescriptionDescribeFamilyAllTerminal;
 use xcm_executor::traits::Convert;
 use xcm_mock::*;
 use xcm_primitives::{UtilityEncodeCall, DEFAULT_PROOF_SIZE};
@@ -2734,7 +2735,7 @@ fn transact_through_signed_multilocation_para_to_para() {
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -2843,7 +2844,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum() {
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -2969,7 +2970,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_no_proxy_fails()
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -3091,7 +3092,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_proxy_succeeds()
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
diff --git a/runtime/moonbeam/src/xcm_config.rs b/runtime/moonbeam/src/xcm_config.rs
index db12ec9f9a..c710f90a1e 100644
--- a/runtime/moonbeam/src/xcm_config.rs
+++ b/runtime/moonbeam/src/xcm_config.rs
@@ -108,7 +108,7 @@ pub type LocationToAccountId = (
 	// If we receive a MultiLocation of type AccountKey20, just generate a native account
 	AccountKey20Aliases<RelayNetwork, AccountId>,
 	// Generate remote accounts according to polkadot standards
-	xcm_builder::ForeignChainAliasAccount<AccountId>,
+	xcm_builder::HashedDescriptionDescribeFamilyAllTerminal<AccountId>,
 );
 
 /// Wrapper type around `LocationToAccountId` to convert an `AccountId` to type `H160`.
diff --git a/runtime/moonbeam/tests/integration_test.rs b/runtime/moonbeam/tests/integration_test.rs
index 4404af8d34..da80cb359d 100644
--- a/runtime/moonbeam/tests/integration_test.rs
+++ b/runtime/moonbeam/tests/integration_test.rs
@@ -2875,7 +2875,7 @@ fn test_xcm_utils_ml_tp_account() {
 			),
 		);
 		let expected_address_alice_in_parachain_2000: H160 =
-			xcm_builder::ForeignChainAliasAccount::<AccountId>::convert_ref(
+			xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::<AccountId>::convert_ref(
 				alice_in_parachain_2000_multilocation.clone(),
 			)
 			.unwrap()
diff --git a/runtime/moonbeam/tests/xcm_mock/parachain.rs b/runtime/moonbeam/tests/xcm_mock/parachain.rs
index 80b5cb5452..e2dc366281 100644
--- a/runtime/moonbeam/tests/xcm_mock/parachain.rs
+++ b/runtime/moonbeam/tests/xcm_mock/parachain.rs
@@ -182,7 +182,7 @@ pub type LocationToAccountId = (
 	SiblingParachainConvertsVia<Sibling, AccountId>,
 	AccountKey20Aliases<RelayNetwork, AccountId>,
 	// Generate remote accounts according to polkadot standards
-	xcm_builder::ForeignChainAliasAccount<AccountId>,
+	xcm_builder::HashedDescriptionDescribeFamilyAllTerminal<AccountId>,
 );
 
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
diff --git a/runtime/moonbeam/tests/xcm_tests.rs b/runtime/moonbeam/tests/xcm_tests.rs
index 2d7a341de4..d944c14179 100644
--- a/runtime/moonbeam/tests/xcm_tests.rs
+++ b/runtime/moonbeam/tests/xcm_tests.rs
@@ -32,6 +32,7 @@ use pallet_xcm_transactor::{
 use sp_core::ConstU32;
 use xcm::latest::prelude::*;
 use xcm::{VersionedMultiLocation, WrapVersion};
+use xcm_builder::HashedDescriptionDescribeFamilyAllTerminal;
 use xcm_executor::traits::Convert;
 use xcm_mock::parachain;
 use xcm_mock::relay_chain;
@@ -2457,7 +2458,7 @@ fn transact_through_signed_multilocation_para_to_para() {
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -2566,7 +2567,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum() {
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -2692,7 +2693,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_no_proxy_fails()
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -2814,7 +2815,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_proxy_succeeds()
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
diff --git a/runtime/moonriver/src/xcm_config.rs b/runtime/moonriver/src/xcm_config.rs
index b1a44dd2d1..7b560343ee 100644
--- a/runtime/moonriver/src/xcm_config.rs
+++ b/runtime/moonriver/src/xcm_config.rs
@@ -110,7 +110,7 @@ pub type LocationToAccountId = (
 	// If we receive a MultiLocation of type AccountKey20, just generate a native account
 	AccountKey20Aliases<RelayNetwork, AccountId>,
 	// Generate remote accounts according to polkadot standards
-	xcm_builder::ForeignChainAliasAccount<AccountId>,
+	xcm_builder::HashedDescriptionDescribeFamilyAllTerminal<AccountId>,
 );
 
 /// Wrapper type around `LocationToAccountId` to convert an `AccountId` to type `H160`.
diff --git a/runtime/moonriver/tests/integration_test.rs b/runtime/moonriver/tests/integration_test.rs
index d6b8279126..2ea6aad3e9 100644
--- a/runtime/moonriver/tests/integration_test.rs
+++ b/runtime/moonriver/tests/integration_test.rs
@@ -2784,7 +2784,7 @@ fn test_xcm_utils_ml_tp_account() {
 			),
 		);
 		let expected_address_alice_in_parachain_2000: H160 =
-			xcm_builder::ForeignChainAliasAccount::<AccountId>::convert_ref(
+			xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::<AccountId>::convert_ref(
 				alice_in_parachain_2000_multilocation.clone(),
 			)
 			.unwrap()
diff --git a/runtime/moonriver/tests/xcm_mock/parachain.rs b/runtime/moonriver/tests/xcm_mock/parachain.rs
index 4315c3e8ac..23f48c9d4f 100644
--- a/runtime/moonriver/tests/xcm_mock/parachain.rs
+++ b/runtime/moonriver/tests/xcm_mock/parachain.rs
@@ -181,7 +181,7 @@ pub type LocationToAccountId = (
 	SiblingParachainConvertsVia<Sibling, AccountId>,
 	AccountKey20Aliases<RelayNetwork, AccountId>,
 	// Generate remote accounts according to polkadot standards
-	xcm_builder::ForeignChainAliasAccount<AccountId>,
+	xcm_builder::HashedDescriptionDescribeFamilyAllTerminal<AccountId>,
 );
 
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
diff --git a/runtime/moonriver/tests/xcm_tests.rs b/runtime/moonriver/tests/xcm_tests.rs
index 86a0297eb2..6e89baafaf 100644
--- a/runtime/moonriver/tests/xcm_tests.rs
+++ b/runtime/moonriver/tests/xcm_tests.rs
@@ -27,6 +27,7 @@ use pallet_asset_manager::LocalAssetIdCreator;
 use sp_core::ConstU32;
 use xcm::latest::prelude::*;
 use xcm::{VersionedMultiLocation, WrapVersion};
+use xcm_builder::HashedDescriptionDescribeFamilyAllTerminal;
 use xcm_executor::traits::Convert;
 use xcm_mock::parachain;
 use xcm_mock::relay_chain;
@@ -2769,7 +2770,7 @@ fn transact_through_signed_multilocation_para_to_para() {
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -2878,7 +2879,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum() {
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -3004,7 +3005,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_no_proxy_fails()
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
@@ -3126,7 +3127,7 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_proxy_succeeds()
 		.reanchor(&para_b_location, ancestry.interior)
 		.unwrap();
 
-	let derived = xcm_builder::ForeignChainAliasAccount::<parachain::AccountId>::convert_ref(
+	let derived = HashedDescriptionDescribeFamilyAllTerminal::<parachain::AccountId>::convert_ref(
 		descend_origin_multilocation,
 	)
 	.unwrap();
diff --git a/tests/util/xcm.ts b/tests/util/xcm.ts
index 83552b118c..c7dacc2cf9 100644
--- a/tests/util/xcm.ts
+++ b/tests/util/xcm.ts
@@ -129,28 +129,11 @@ export function descendOriginFromAddress20(
   paraId: number = 1
 ) {
   const toHash = new Uint8Array([
-    ...new TextEncoder().encode("ForeignChainAliasAccountPrefix_Para20"),
-    ...context.polkadotApi.createType("u32", paraId).toU8a(),
+    ...new TextEncoder().encode("SiblingChain"),
+    ...context.polkadotApi.createType("Compact<u32>", paraId).toU8a(),
+    ...context.polkadotApi.createType("Compact<u32>", "AccountKey20".length + 20).toU8a(),
+    ...new TextEncoder().encode("AccountKey20"),
     ...context.polkadotApi.createType("AccountId", address).toU8a(),
-    ...new Uint8Array([1]),
-  ]);
-
-  return {
-    originAddress: address,
-    descendOriginAddress: u8aToHex(context.polkadotApi.registry.hash(toHash).slice(0, 20)),
-  };
-}
-
-export function descendOriginFromAddress32(
-  context: DevTestContext,
-  address: string,
-  paraId: number = 1
-) {
-  const toHash = new Uint8Array([
-    ...new TextEncoder().encode("ForeignChainAliasAccountPrefix_Para32"),
-    ...context.polkadotApi.createType("u32", paraId).toU8a(),
-    ...context.polkadotApi.createType("AccountId", address).toU8a(),
-    ...new Uint8Array([1]),
   ]);
 
   return {