diff --git a/Makefile b/Makefile
index 2ea42d4918..a3a12c40fe 100644
--- a/Makefile
+++ b/Makefile
@@ -80,11 +80,11 @@ test-cargo-all-benchmarks:
 
 .PHONY: test-ts-litentry ## Run litentry ts tests without clean-up
 test-ts-litentry: launch-network-litentry
-	@cd parachain && ./scripts/run-ts-test.sh litentry
+	@trap "./scripts/clean-network.sh" EXIT; cd parachain && ./scripts/run-ts-test.sh litentry
 
 .PHONY: test-ts-paseo ## Run paseo ts tests without clean-up
 test-ts-paseo: launch-network-paseo
-	@cd parachain && ./scripts/run-ts-test.sh paseo
+	@trap "./scripts/clean-network.sh" EXIT; cd parachain && ./scripts/run-ts-test.sh paseo
 
 # clean up
 .PHONY: clean-network ## Clean up the network launched by 'launch-network'
diff --git a/parachain/Cargo.lock b/parachain/Cargo.lock
index c10f042015..ed0b78044e 100644
--- a/parachain/Cargo.lock
+++ b/parachain/Cargo.lock
@@ -3050,7 +3050,7 @@ dependencies = [
 [[package]]
 name = "evm-tracing-events"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "environmental",
  "ethereum",
@@ -6500,7 +6500,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-client-evm-tracing"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
@@ -6516,7 +6516,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-evm-tracer"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum-types",
  "evm",
@@ -6536,7 +6536,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-primitives-ext"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
@@ -6549,7 +6549,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-debug"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6566,7 +6566,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-trace"
 version = "0.6.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum-types",
  "futures 0.3.31",
@@ -6580,7 +6580,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-txpool"
 version = "0.6.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6593,7 +6593,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-types"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum-types",
  "serde",
@@ -6603,7 +6603,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-debug"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6635,7 +6635,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-primitives-debug"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "environmental",
  "ethereum",
@@ -6653,7 +6653,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-primitives-txpool"
 version = "0.6.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
@@ -6667,7 +6667,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-trace"
 version = "0.6.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6703,7 +6703,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-txpool"
 version = "0.6.0"
-source = "git+https://github.com/AstarNetwork/Astar?tag=v5.45.0#9640def0ab176863f1e3b89e74461431a9ade171"
+source = "git+https://github.com/litentry/moonbeam-vendor-rpc#e50783eb7f4adf08f3181eb3c4766b7d15b6b9db"
 dependencies = [
  "ethereum-types",
  "fc-rpc",
diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
index 3d7e8c27a3..a73ea4c929 100644
--- a/parachain/Cargo.toml
+++ b/parachain/Cargo.toml
@@ -119,13 +119,13 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-
 cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
 
 # evm-tracing, use the astar version to use "standard" substrate frame to avoid any conflicts
-moonbeam-primitives-ext = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
-moonbeam-rpc-debug = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0" }
-moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
-moonbeam-rpc-primitives-txpool = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
-moonbeam-rpc-trace = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
-moonbeam-rpc-txpool = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
-moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
+moonbeam-primitives-ext = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
+moonbeam-rpc-debug = { git = "https://github.com/litentry/moonbeam-vendor-rpc" }
+moonbeam-rpc-primitives-debug = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
+moonbeam-rpc-primitives-txpool = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
+moonbeam-rpc-trace = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
+moonbeam-rpc-txpool = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
+moonbeam-evm-tracer = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
 
 # polkadot client
 polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" }
diff --git a/parachain/scripts/clean-network.sh b/parachain/scripts/clean-network.sh
index 1fe18eecdd..c1e7667e51 100755
--- a/parachain/scripts/clean-network.sh
+++ b/parachain/scripts/clean-network.sh
@@ -19,7 +19,7 @@ esac
 ZOMBIENET_BIN=zombienet-${os}-${arch}
 ZOMBIENET_PID=$(pidof $ZOMBIENET_BIN)
 
-if [ -z $ZOMBIENET_PID ]; then
+if [ -z "$ZOMBIENET_PID" ]; then
   # the network might not be started with zombienet
   killall polkadot || true
   killall litentry-collator || true
@@ -27,7 +27,7 @@ else
   kill -2 $ZOMBIENET_PID
 fi
 
-docker ps -q -f name=geth | xargs -r docker stop 
+docker ps -q -f name=geth | xargs -r docker stop
 
 rm -rf "$LITENTRY_PARACHAIN_DIR"