diff --git a/beacon-chain/entrypoint.sh b/beacon-chain/entrypoint.sh
index f96ae89..2a1e561 100755
--- a/beacon-chain/entrypoint.sh
+++ b/beacon-chain/entrypoint.sh
@@ -62,13 +62,14 @@ else
 fi
 
 FLAGS="--accept-terms-of-use \
+  --blob-storage-layout=by-epoch \
   --datadir=$DATA_DIR \
   --jwt-secret=$JWT_FILE_PATH \
   --execution-endpoint=$ENGINE_URL \
   --monitoring-host=0.0.0.0 \
-  --grpc-gateway-host=0.0.0.0 \
-  --grpc-gateway-port=$BEACON_API_PORT \
-  --grpc-gateway-corsdomain=$CORSDOMAIN \
+  --http-host=0.0.0.0 \
+  --http-port=$BEACON_API_PORT \
+  --http-corsdomain=$CORSDOMAIN \
   --rpc-host=0.0.0.0 \
   --verbosity=$VERBOSITY \
   --p2p-tcp-port=$P2P_TCP_PORT \
diff --git a/validator/entrypoint.sh b/validator/entrypoint.sh
index 690fd78..9fcbbeb 100755
--- a/validator/entrypoint.sh
+++ b/validator/entrypoint.sh
@@ -23,10 +23,6 @@ MEVBOOST_FLAG=$(get_mevboost_flag "${NETWORK}" "${MEVBOOST_FLAG_KEY}" "${SKIP_ME
 # Example: http://localhost:4000 -> localhost
 BEACON_DOMAIN="$(echo "$BEACON_API_URL" | cut -d'/' -f3 | cut -d':' -f1)"
 
-# Prepare API endpoints (no http:// prefix && add port)
-BEACON_RPC_PROVIDER="${BEACON_DOMAIN}:4000"
-BEACON_RPC_GATEWAY_PROVIDER="${BEACON_DOMAIN}:3500"
-
 case "$NETWORK" in
 "hoodi")
     NETWORK_FLAGS="--hoodi"
@@ -49,12 +45,11 @@ esac
 FLAGS="--datadir=$DATA_DIR \
     --wallet-dir=$WALLET_DIR \
     --monitoring-host=0.0.0.0 \
-    --beacon-rpc-provider=$BEACON_RPC_PROVIDER \
-    --beacon-rpc-gateway-provider=$BEACON_RPC_GATEWAY_PROVIDER \
+    --beacon-rest-api-provider=${BEACON_DOMAIN}:3500 \
     --validators-external-signer-url=$SIGNER_API_URL \
-    --grpc-gateway-host=0.0.0.0 \
-    --grpc-gateway-port=$VALIDATOR_API_PORT \
-    --grpc-gateway-corsdomain=http://0.0.0.0:$VALIDATOR_API_PORT \
+    --http-host=0.0.0.0 \
+    --http-port=$VALIDATOR_API_PORT \
+    --http-corsdomain=http://0.0.0.0:$VALIDATOR_API_PORT \
     --graffiti=$VALID_GRAFFITI \
     --suggested-fee-recipient=$VALID_FEE_RECIPIENT \
     --verbosity=$VERBOSITY \