diff --git a/op-node/entrypoint.sh b/op-node/entrypoint.sh
index 2dadc19..0b8df02 100755
--- a/op-node/entrypoint.sh
+++ b/op-node/entrypoint.sh
@@ -3,19 +3,24 @@
 # If CUSTOM_L1_RPC is set, use it. Otherwise, use the proper value depending on the _DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET variable
 if [ ! -z "$CUSTOM_L1_RPC" ]; then
   L1_RPC=$CUSTOM_L1_RPC
+  L1_RPC_TRUST=true
 elif [ ! -z "$_DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET" ]; then
   case $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET in
   "geth.dnp.dappnode.eth")
     L1_RPC="http://geth.dappnode:8545"
+    L1_RPC_TRUST=true
     ;;
   "nethermind.public.dappnode.eth")
     L1_RPC="http://nethermind.public.dappnode:8545"
+    L1_RPC_TRUST=true
     ;;
   "erigon.dnp.dappnode.eth")
     L1_RPC="http://erigon.dappnode:8545"
+    L1_RPC_TRUST=true
     ;;
   "besu.public.dappnode.eth")
     L1_RPC="http://besu.public.dappnode:8545"
+    L1_RPC_TRUST=true
     ;;
   *)
     echo "Unknown value for _DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET: $_DAPPNODE_GLOBAL_EXECUTION_CLIENT_MAINNET"
@@ -64,11 +69,11 @@ fi
 
 case $_DAPPNODE_GLOBAL_OP_EXECUTION_CLIENT in
 "op-geth.dnp.dappnode.eth")
-  L2_ENGINE="http://op-geth.dappnode:8551"
+  L2_ENGINE="ws://op-geth.dappnode:8551"
   JWT_PATH="/security/op-geth/jwtsecret.hex"
   ;;
 "op-erigon.dnp.dappnode.eth")
-  L2_ENGINE="http://op-erigon.dappnode:8551"
+  L2_ENGINE="ws://op-erigon.dappnode:8551"
   JWT_PATH="/security/op-erigon/jwtsecret.hex"
   ;;
 *)
@@ -81,12 +86,13 @@ esac
 while true; do
   op-node --network=op-mainnet \
     --l1="$L1_RPC" \
+    --l1.trustrpc=$L1_RPC_TRUST \
     --l1.beacon="$L1_BEACON_API" \
     --l2="$L2_ENGINE" \
     --l2.jwt-secret="$JWT_PATH" \
     --rpc.addr=0.0.0.0 \
     --rpc.port=9545 \
-    ${EXTRA_FLAGS}
+    ${EXTRA_OPTS}
 
   STATUS=$?