diff --git a/beacon-chain/entrypoint.sh b/beacon-chain/entrypoint.sh
index cabfcf6..0428867 100755
--- a/beacon-chain/entrypoint.sh
+++ b/beacon-chain/entrypoint.sh
@@ -29,21 +29,22 @@ else
     echo "[WARN - entrypoint] No checkpoint sync script provided. Syncing from genesis."
 fi
 
-echo "[INFO - entrypoint] Running beacon node service"
-
-# shellcheck disable=SC2086
-exec ${NIMBUS_BIN} \
-    --network="${NETWORK}" \
-    --data-dir="${DATA_DIR}" \
-    --tcp-port="${P2P_PORT}" \
-    --udp-port="${P2P_PORT}" \
-    --log-level="${LOG_TYPE}" \
+FLAGS="--network=$NETWORK \
+    --data-dir=$DATA_DIR \
+    --tcp-port=$P2P_PORT \
+    --udp-port=$P2P_PORT \
+    --log-level=$LOG_TYPE \
     --rest \
     --rest-port=3500 \
     --rest-address=0.0.0.0 \
     --metrics \
     --metrics-address=0.0.0.0 \
     --metrics-port=8008 \
-    --jwt-secret="${JWT_FILE_PATH}" \
-    --web3-url="${ENGINE_URL}" \
-    --suggested-fee-recipient="${VALID_FEE_RECIPIENT}" ${MEVBOOST_FLAG} ${EXTRA_OPTS}
+    --jwt-secret=$JWT_FILE_PATH \
+    --web3-url=$ENGINE_URL \
+    --suggested-fee-recipient=$VALID_FEE_RECIPIENT $MEVBOOST_FLAG $EXTRA_OPTS"
+
+echo "[INFO - entrypoint] Starting beacon with flags: $FLAGS"
+
+# shellcheck disable=SC2086
+exec ${NIMBUS_BIN} $FLAGS
diff --git a/validator/entrypoint.sh b/validator/entrypoint.sh
index ccfce37..34c40e9 100644
--- a/validator/entrypoint.sh
+++ b/validator/entrypoint.sh
@@ -16,21 +16,22 @@ MEVBOOST_FLAG=$(get_mevboost_flag "${NETWORK}" "${MEVBOOST_FLAG_KEY}" "${SKIP_ME
 
 echo "[INFO - entrypoint] Running validator service"
 
-# shellcheck disable=SC2086
-exec ${NIMBUS_BIN} \
-    --log-level="${LOG_TYPE}" \
-    --data-dir="${DATA_DIR}" \
-    --doppelganger-detection="${ENABLE_DOPPELGANGER}" \
+FLAGS="--log-level=$LOG_TYPE \
+    --data-dir=$DATA_DIR \
+    --doppelganger-detection=$ENABLE_DOPPELGANGER \
     --non-interactive \
-    --web3-signer-url="${SIGNER_API_URL}" \
-    --suggested-fee-recipient="${VALID_FEE_RECIPIENT}" \
+    --web3-signer-url=$SIGNER_API_URL \
+    --suggested-fee-recipient=$VALID_FEE_RECIPIENT \
     --keymanager=true \
     --keymanager-port=3500 \
     --keymanager-address=0.0.0.0 \
     --keymanager-allow-origin=* \
-    --keymanager-token-file="${VALIDATOR_API_TOKEN_PATH}" \
+    --keymanager-token-file=$VALIDATOR_API_TOKEN_PATH \
     --metrics=true \
     --metrics-address=0.0.0.0 \
     --metrics-port=8008 \
-    --graffiti="${VALID_GRAFFITI}" \
-    --beacon-node="${BEACON_API_URL}" ${MEVBOOST_FLAG} ${EXTRA_OPTS}
+    --graffiti=$VALID_GRAFFITI \
+    --beacon-node=$BEACON_API_URL $MEVBOOST_FLAG $EXTRA_OPTS"
+
+# shellcheck disable=SC2086
+exec ${NIMBUS_BIN} $FLAGS