diff --git a/core/packages/test/scripts/configure-statemine.sh b/core/packages/test/scripts/configure-statemine.sh
index 9d602d432b..b064cec029 100755
--- a/core/packages/test/scripts/configure-statemine.sh
+++ b/core/packages/test/scripts/configure-statemine.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env sh
-
 set -eu
 
+source scripts/xcm-helper.sh
+
 generate_hex_encoded_call_data() {
     local type=$1
     local endpoint=$2
@@ -22,109 +23,29 @@ generate_hex_encoded_call_data() {
     return $retVal
 }
 
-send_governance_transact() {
-    local relay_url=$1
-    local relay_chain_seed=$2
-    local para_id=$3
-    local hex_encoded_data=$4
-    local require_weight_at_most_ref_time=$5
-    local require_weight_at_most_proof_size=$6
-    echo "  calling send_governance_transact:"
-    echo "      relay_url: ${relay_url}"
-    echo "      relay_chain_seed: ${relay_chain_seed}"
-    echo "      para_id: ${para_id}"
-    echo "      hex_encoded_data: ${hex_encoded_data}"
-    echo "      require_weight_at_most_ref_time: ${require_weight_at_most_ref_time}"
-    echo "      require_weight_at_most_proof_size: ${require_weight_at_most_proof_size}"
-    echo "      params:"
-
-    local dest=$(jq --null-input \
-                    --arg para_id "$para_id" \
-                    '{ "v3": { "parents": 0, "interior": { "x1": { "parachain": $para_id } } } }')
-
-    local message=$(jq --null-input \
-                       --argjson hex_encoded_data $hex_encoded_data \
-                       --arg require_weight_at_most_ref_time "$require_weight_at_most_ref_time" \
-                       --arg require_weight_at_most_proof_size "$require_weight_at_most_proof_size" \
-                       '
-                       {
-                          "v3": [
-                                  {
-                                    "unpaidexecution": {
-                                        "weight_limit": "unlimited"
-                                    }
-                                  },
-                                  {
-                                    "transact": {
-                                      "origin_kind": "superuser",
-                                      "require_weight_at_most": {
-                                        "ref_time": $require_weight_at_most_ref_time,
-                                        "proof_size": $require_weight_at_most_proof_size,
-                                      },
-                                      "call": {
-                                        "encoded": $hex_encoded_data
-                                      }
-                                    }
-                                  }
-                          ]
-                        }
-                        ')
-
-    echo ""
-    echo "          dest:"
-    echo "${dest}"
-    echo ""
-    echo "          message:"
-    echo "${message}"
-    echo ""
-    echo "--------------------------------------------------"
-
-    npx polkadot-js-api \
-        --ws "${relay_url?}" \
-        --seed "${relay_chain_seed?}" \
-        --sudo \
-        tx.xcmPallet.send \
-            "${dest}" \
-            "${message}"
-}
-
 add_exporter_config() {
-    local relay_url=$1
-    local relay_chain_seed=$2
-    local statemine_para_id=$3
-    local statemine_para_endpoint=$4
-    local bridge_hub_para_id=$5
-    local ethereum_chain_id=$6
-
     echo "  calling add_exporter_config:"
-    echo "      relay_url: ${relay_url}"
-    echo "      relay_chain_seed: ${relay_chain_seed}"
-    echo "      statemine_para_id: ${statemine_para_id}"
-    echo "      runtime_para_endpoint: ${statemine_para_endpoint}"
-    echo "      bridge_hub_para_id: ${bridge_hub_para_id}"
-    echo "      ethereum_chain_id: ${ethereum_chain_id}"
-    echo "      params:"
 
     local bridged_network=$(jq --null-input \
-                               --arg ethereum_chain_id "$ethereum_chain_id" \
+                               --arg eth_chain_id "$eth_chain_id" \
       '
         { 
           "Ethereum": { 
-            "chainId": $ethereum_chain_id 
+            "chainId": $eth_chain_id 
           } 
         }
       '
     )
     # Generate data for Transact (add_exporter_config)
     local bridge_config=$(jq --null-input \
-                             --arg bridge_hub_para_id "$bridge_hub_para_id" \
+                             --arg bridgehub_para_id "$bridgehub_para_id" \
                              --arg bridged_network "$bridged_network" \
         '
             {
                 "bridgeLocation": {
                     "parents": 1,
                     "interior": {
-                        "X1": { "Parachain": $bridge_hub_para_id }
+                        "X1": { "Parachain": $bridgehub_para_id }
                     }
                 },
                 "allowedTargetLocation": {
@@ -138,42 +59,103 @@ add_exporter_config() {
             }
         '
     )
+
+    echo ""
+    echo "          bridged_network:"
+    echo "${bridged_network}"
+    echo ""
+    echo "          bridge_config:"
+    echo "${bridge_config}"
+    echo ""
+    echo "--------------------------------------------------"
+
     local tmp_output_file=$(mktemp)
     generate_hex_encoded_call_data \
       "add-exporter-config" \
-      "$statemine_para_endpoint" \
+      "$statemine_ws_url" \
       "$tmp_output_file" \
       "$bridged_network" \
       "$bridge_config"
     local hex_encoded_data=$(cat $tmp_output_file)
     rm $tmp_output_file
 
-    send_governance_transact "${relay_url}" "${relay_chain_seed}" "${statemine_para_id}" "${hex_encoded_data}" 200000000 12000
+    send_governance_transact_from_relaychain "${statemine_para_id}" "${hex_encoded_data}" 200000000 12000
 }
 
-if [ "$#" -eq 0 ]; then
-    cat <<EOF
-usage:
-    $0 messages
+add_universal_alias() {
+    echo "  calling add_universal_alias:"
+    local location=$(jq --null-input \
+                        --arg bridgehub_para_id "$bridgehub_para_id" \
+                        '{ "V3": { "parents": 1, "interior": { "X1": { "Parachain": $bridgehub_para_id } } } }') # BridgeHub
 
-    messages:
-        add-exporter-config - adds bridge config for ethereum.
-EOF
-    exit 1
-fi
+    local junction=$(jq --null-input \
+                        --arg eth_chain_id "$eth_chain_id" \
+                        '{ "GlobalConsensus": { "Ethereum": { "chainId": $eth_chain_id } } }')
 
-while [ "$#" -gt 0 ]; do
-  case "$1" in
-    add-exporter-config)
-      shift
-      add_exporter_config $1 $2 $3 $4 $5 $6
-      shift 6
-      ;;
-    *)
-      echo "Unknown message: $1"
-      exit 1
-      ;;
-  esac
-done
-
-exit 0
+    echo ""
+    echo "          location:"
+    echo "${location}"
+    echo ""
+    echo "          junction:"
+    echo "${junction}"
+    echo ""
+    echo "--------------------------------------------------"
+
+    local tmp_output_file=$(mktemp)
+    generate_hex_encoded_call_data "add-universal-alias" "${statemine_ws_url}" "${tmp_output_file}" "$location" "$junction"
+    local hex_encoded_data=$(cat $tmp_output_file)
+    rm $tmp_output_file
+
+    send_governance_transact_from_relaychain "${statemine_para_id}" "${hex_encoded_data}" 200000000 12000
+}
+
+add_reserve_location() {
+    echo "  calling add_reserve_location:"
+
+    local nativeTokens=$1
+    # Ethereum Native Tokens contract
+    local reserve_location=$(jq --null-input \
+                        --arg eth_chain_id "$eth_chain_id" \
+                        --arg nativeTokens "$nativeTokens" \
+                        '{ "V3": {
+                            "parents": 2,
+                            "interior": {
+                                "X2": [
+                                    {
+                                        "GlobalConsensus": { "Ethereum": { "chainId": $eth_chain_id } },
+                                    },
+                                    {
+                                        "AccountKey20": { "network": { "Ethereum": { "chainId": $eth_chain_id } }, "key": $nativeTokens }
+                                    }
+                                ]
+                            }
+                        } }')
+
+    echo ""
+    echo "          reserve_location:"
+    echo "${reserve_location}"
+    echo ""
+    echo "--------------------------------------------------"
+
+    local tmp_output_file=$(mktemp)
+    generate_hex_encoded_call_data "add-reserve-location" "${statemine_ws_url}" "${tmp_output_file}" "$reserve_location"
+    local hex_encoded_data=$(cat $tmp_output_file)
+    rm $tmp_output_file
+
+    send_governance_transact_from_relaychain "${statemine_para_id}" "${hex_encoded_data}" 200000000 12000
+}
+
+configure_statemine() {
+    # Allows messages to be sent from Substrate to ETH.
+    add_exporter_config
+    # Allow messages to be sent from ETH to Substrate.
+    add_universal_alias
+    # Allow NativeTokens contract to ReserveAssetDeposited xcm instruction.
+    add_reserve_location $(address_for NativeTokens)
+}
+
+if [ -z "${from_start_services:-}" ]; then
+    echo "configuring statemine"
+    configure_statemine
+    wait
+fi
diff --git a/core/packages/test/scripts/deploy-polkadot.sh b/core/packages/test/scripts/deploy-polkadot.sh
index cc7d7effc8..ce70c989c2 100755
--- a/core/packages/test/scripts/deploy-polkadot.sh
+++ b/core/packages/test/scripts/deploy-polkadot.sh
@@ -15,13 +15,4 @@ zombienet_launch() {
 
 deploy_polkadot() {
     zombienet_launch
-
-    # Configure statemine
-    scripts/configure-statemine.sh add-exporter-config \
-        $relaychain_ws_url \
-        $relaychain_sudo_seed \
-        $statemine_para_id \
-        $statemine_ws_url \
-        $bridgehub_para_id \
-        $eth_chain_id
 }
diff --git a/core/packages/test/scripts/helpers/generateHexEncodedCallData.js b/core/packages/test/scripts/helpers/generateHexEncodedCallData.js
index e842939c0b..a813910b51 100644
--- a/core/packages/test/scripts/helpers/generateHexEncodedCallData.js
+++ b/core/packages/test/scripts/helpers/generateHexEncodedCallData.js
@@ -15,9 +15,10 @@ async function connect(endpoint, types = {}) {
 }
 
 function writeHexEncodedBytesToOutput(method, outputFile) {
-  console.log("Payload (hex): ", method.toHex());
+  const hex = method.toHex();
+  console.log("Payload (hex): ", hex);
   console.log("Payload (bytes): ", Array.from(method.toU8a()));
-  fs.writeFileSync(outputFile, JSON.stringify(Array.from(method.toU8a())));
+  fs.writeFileSync(outputFile, hex);
 }
 
 function remarkWithEvent(endpoint, outputFile) {
diff --git a/core/packages/test/scripts/send-xcm.sh b/core/packages/test/scripts/send-xcm.sh
deleted file mode 100755
index 1874278907..0000000000
--- a/core/packages/test/scripts/send-xcm.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env sh
-
-set -eu
-
-source scripts/set-env.sh
-source scripts/xcm-helper.sh
-
-if [ "$#" -eq 0 ]; then
-    cat <<EOF
-usage:
-    $0 messages
-
-    messages:
-        trap - Sends an xcm message from Statemine to Bridgehub and then does an XCM trap.
-EOF
-    exit 1
-fi
-
-while [ "$#" -gt 0 ]; do
-  case "$1" in
-    statemine-trap)
-      shift
-      statemine_trap_message
-      ;;
-    bridgehub-trap)
-      shift
-      bridgehub_trap_message
-      ;;
-    *)
-      echo "Unknown message: $1"
-      exit 1
-      ;;
-  esac
-done
-
-exit 0
diff --git a/core/packages/test/scripts/set-env.sh b/core/packages/test/scripts/set-env.sh
index b9135a754d..9c0530bcbc 100755
--- a/core/packages/test/scripts/set-env.sh
+++ b/core/packages/test/scripts/set-env.sh
@@ -26,7 +26,7 @@ eth_network="${ETH_NETWORK:-localhost}"
 eth_endpoint_http="${ETH_RPC_ENDPOINT:-http://127.0.0.1:8545}/${INFURA_PROJECT_ID:-}"
 eth_endpoint_ws="${ETH_WS_ENDPOINT:-ws://127.0.0.1:8546}/${INFURA_PROJECT_ID:-}"
 eth_gas_limit="${ETH_GAS_LIMIT:-5000000}"
-eth_chain_id=1
+eth_chain_id=15
 eth_fast_mode="${ETH_FAST_MODE:-false}"
 
 beefy_state_file="${BEEFY_STATE_FILE:-$output_dir/beefy-state.json}"
diff --git a/core/packages/test/scripts/start-services.sh b/core/packages/test/scripts/start-services.sh
index 06d63ae68e..03373d5cac 100755
--- a/core/packages/test/scripts/start-services.sh
+++ b/core/packages/test/scripts/start-services.sh
@@ -32,7 +32,11 @@ configure_beefy
 source scripts/configure-beacon.sh
 configure_beacon
 
-# 5. start relayer
+# 5. Configure bridgehub exporter on statemine
+source scripts/configure-statemine.sh 
+configure_statemine
+
+# 6. start relayer
 echo "Starting relayers"
 source scripts/start-relayer.sh
 start_relayer
diff --git a/core/packages/test/scripts/xcm-helper.sh b/core/packages/test/scripts/xcm-helper.sh
index af66da1df8..099bf59685 100644
--- a/core/packages/test/scripts/xcm-helper.sh
+++ b/core/packages/test/scripts/xcm-helper.sh
@@ -3,131 +3,6 @@ set -eu
 
 source scripts/set-env.sh
 
-statemine_trap_message() {
-    echo Sending trap message.
-
-    echo "  calling send_xcm_trap_from_statemine:"
-    echo "      seed: ${statemine_seed}"
-    echo "      statemine_ws_url: ${statemine_ws_url}"
-    echo "      statemine_para_id: ${statemine_para_id}"
-    echo "      bridgehub_ws_url: ${bridgehub_ws_url}"
-    echo "      bridgehub_para_id: ${bridgehub_para_id}"
-    echo "      params:"
-
-    local dest=$(jq --null-input \
-                    --arg bridgehub_para_id "$bridgehub_para_id" \
-                    '{ "V3": { "parents": 1, "interior": { "X1": { "Parachain": $bridgehub_para_id } } } }')
-
-    local message=$(jq --null-input \
-                       '
-                       {
-                          "V3": [
-                            {
-                              "UnpaidExecution": {
-                                "weight_limit": "Unlimited"
-                              }
-                            },
-                            {
-                              "ExportMessage": {
-                                "network": {
-                                    "Ethereum": { chainId: 1 }
-                                },
-                                "destination": {
-                                  "Here": "Null"
-                                },
-                                "xcm": [
-                                  {
-                                    "Trap": 12345
-                                  }
-                                ]
-                              }
-                            }
-                          ]
-                        }
-                        ')
-
-    echo ""
-    echo "          dest:"
-    echo "${dest}"
-    echo ""
-    echo "          message:"
-    echo "${message}"
-    echo ""
-    echo "--------------------------------------------------"
-
-    npx polkadot-js-api \
-        --ws "${statemine_ws_url?}" \
-        --seed "${statemine_seed?}" \
-        tx.polkadotXcm.send \
-            "${dest}" \
-            "${message}"
-}
-
-bridgehub_trap_message() {
-    echo Sending trap message.
-
-    echo "  calling send_xcm_trap_from_bridgehub:"
-    echo "      seed: ${bridgehub_seed}"
-    echo "      statemine_ws_url: ${statemine_ws_url}"
-    echo "      statemin_para_id: ${statemine_para_id}"
-    echo "      bridgehub_ws_url: ${bridgehub_ws_url}"
-    echo "      bridgehub_para_id: ${bridgehub_para_id}"
-    echo "      params:"
-
-    local dest=$(jq --null-input \
-                    --arg statemine_para_id "$statemine_para_id" \
-                    '{ "V3": { "parents": 1, "interior": { "X1": { "Parachain": $statemine_para_id } } } }')
-
-    local weight='{ "refTime": 900000000, "proofSize": 10000 }'
-
-    local message=$(jq --null-input \
-                       '
-                       {
-                          "V3": [
-                            {
-                              "UnpaidExecution": {
-                                "weight_limit": "Unlimited"
-                              }
-                            },
-                            {
-                              "ExportMessage": {
-                                "network": {
-                                    "Ethereum": { chainId: 1 }
-                                },
-                                "destination": {
-                                  "Here": "Null"
-                                },
-                                "xcm": [
-                                  {
-                                    "Trap": 12345
-                                  }
-                                ]
-                              }
-                            }
-                          ]
-                        }
-                        ')
-
-    echo ""
-    echo "          dest:"
-    echo "${dest}"
-    echo ""
-    echo "          weight:"
-    echo "${weight}"
-    echo ""
-    echo "          message:"
-    echo "${message}"
-    echo ""
-    echo "--------------------------------------------------"
-
-    npx polkadot-js-api \
-        --ws "${bridgehub_ws_url?}" \
-        --seed "${bridgehub_seed?}" \
-        tx.polkadotXcm.execute \
-            "${message}" \
-            "${weight}"
-}
-
 send_governance_transact_from_relaychain() {
     local para_id=$1
     local hex_encoded_data=$2
diff --git a/cumulus b/cumulus
index 9f1d382800..af6613e13c 160000
--- a/cumulus
+++ b/cumulus
@@ -1 +1 @@
-Subproject commit 9f1d38280075a0e39b58a789218e738166bc55b7
+Subproject commit af6613e13c38110b3b1b8afe3acb94296ae7dd9f