diff --git a/smoketest/make-bindings.sh b/smoketest/make-bindings.sh
index f575146bb..9eb6fccb8 100755
--- a/smoketest/make-bindings.sh
+++ b/smoketest/make-bindings.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -eu
+source ../web/packages/test/scripts/set-env.sh
 rm -rf src/contracts
 mkdir -p src/contracts
 
@@ -52,11 +53,12 @@ else
   --derive ::subxt::ext::subxt_core::ext::codec::Decode
   subxt codegen --url ws://localhost:13144 >src/parachains/penpal.rs \
   --derive-for-type staging_xcm::v5::location::Location=Clone,recursive \
+  --derive-for-type staging_xcm::v5::location::Location=::subxt::ext::codec::Encode,recursive \
+  --derive-for-type staging_xcm::v5::location::Location=::subxt::ext::codec::Decode,recursive \
+  --derive-for-type xcm::VersionedXcm=::subxt::ext::codec::Encode,recursive \
+  --derive-for-type xcm::VersionedXcm=::subxt::ext::codec::Decode,recursive \
   --derive-for-type staging_xcm::v5::asset::AssetId=Clone,recursive \
-  --derive-for-type staging_xcm::v5::asset::Assets=Clone,recursive \
-  --derive ::subxt::ext::subxt_core::ext::codec::Encode \
-  --derive ::subxt::ext::subxt_core::ext::codec::Decode
-
+  --derive-for-type staging_xcm::v5::asset::Assets=Clone,recursive
 fi
 
 
diff --git a/smoketest/src/helper.rs b/smoketest/src/helper.rs
index 64829999f..f2aed7ce3 100644
--- a/smoketest/src/helper.rs
+++ b/smoketest/src/helper.rs
@@ -763,7 +763,7 @@ pub async fn get_agent_address(
 	agent_id: [u8; 32],
 ) -> Result<Address, Box<dyn std::error::Error>> {
 	let gateway_addr: Address = (*GATEWAY_PROXY_CONTRACT).into();
-	let gateway = IGatewayV2::new(gateway_addr, *ethereum_client);
+	let gateway = IGateway::new(gateway_addr, *ethereum_client);
 	let agent_address = gateway.agentOf(FixedBytes::from(agent_id)).call().await?;
 	Ok(agent_address)
 }
diff --git a/web/packages/test/scripts/set-env.sh b/web/packages/test/scripts/set-env.sh
index bad4d75c8..ff595d718 100755
--- a/web/packages/test/scripts/set-env.sh
+++ b/web/packages/test/scripts/set-env.sh
@@ -92,8 +92,8 @@ export ETHERSCAN_API_KEY="${ETHERSCAN_API_KEY:-0x0}"
 # but for rococo-local each session is only 20 slots=120s
 # so relax somehow here just for quick test
 # for production deployment ETH_RANDAO_DELAY should be configured in a more reasonable sense
-export RANDAO_COMMIT_DELAY="${ETH_RANDAO_DELAY:-3}"
-export RANDAO_COMMIT_EXP="${ETH_RANDAO_EXP:-3}"
+export RANDAO_COMMIT_DELAY="${ETH_RANDAO_DELAY:-4}"
+export RANDAO_COMMIT_EXP="${ETH_RANDAO_EXP:-32}"
 export MINIMUM_REQUIRED_SIGNATURES="${MINIMUM_REQUIRED_SIGNATURES:-16}"
 
 ## Fee