diff --git a/beacon-chain/entrypoint.sh b/beacon-chain/entrypoint.sh
index 52cc498..a89e686 100755
--- a/beacon-chain/entrypoint.sh
+++ b/beacon-chain/entrypoint.sh
@@ -13,7 +13,7 @@ if [ "$NETWORK" = "sepolia" ]; then
   ENGINE_URL="http://sepolia-geth.dappnode:8551"
 fi
 
-VALID_FEE_RECIPIENT=$(get_valid_fee_recipient "${FEE_RECIPIENT}")
+VALID_FEE_RECIPIENT=$(get_valid_fee_recipient "${FEE_RECIPIENT_ADDRESS}")
 MEVBOOST_FLAG=$(get_mevboost_flag "${NETWORK}" "${MEVBOOST_FLAG_KEY}")
 
 JWT_SECRET=$(get_jwt_secret_by_network "${NETWORK}")
diff --git a/docker-compose.yml b/docker-compose.yml
index b1893ab..c549a3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     environment:
       CHECKPOINT_SYNC_URL: ""
       EXTRA_OPTS: ""
-      FEE_RECIPIENT: ""
+      FEE_RECIPIENT_ADDRESS: ""
       VERBOSITY: info
       MIN_SYNC_PEERS: "3"
       MAX_PEERS: "70"
@@ -32,7 +32,7 @@ services:
       LOG_TYPE: INFO
       GRAFFITI: validating_from_DAppNode
       EXTRA_OPTS: ""
-      FEE_RECIPIENT: ""
+      FEE_RECIPIENT_ADDRESS: ""
       VERBOSITY: info
 volumes:
   beacon-chain-data: {}
diff --git a/setup-wizard.yml b/setup-wizard.yml
index 206ceed..7db8140 100644
--- a/setup-wizard.yml
+++ b/setup-wizard.yml
@@ -24,7 +24,7 @@ fields:
   - id: feeRecipientAddress
     target:
       type: environment
-      name: FEE_RECIPIENT
+      name: FEE_RECIPIENT_ADDRESS
       service: [beacon-chain, validator]
     title: Fee Recipient Address
     description: >-
diff --git a/validator/entrypoint.sh b/validator/entrypoint.sh
index 8f21b3f..4cec0af 100755
--- a/validator/entrypoint.sh
+++ b/validator/entrypoint.sh
@@ -14,7 +14,7 @@ CLIENT="prysm"
 . /etc/profile.d/consensus_tools.sh
 
 VALID_GRAFFITI=$(get_valid_graffiti "${GRAFFITI}")
-VALID_FEE_RECIPIENT=$(get_valid_fee_recipient "${FEE_RECIPIENT}")
+VALID_FEE_RECIPIENT=$(get_valid_fee_recipient "${FEE_RECIPIENT_ADDRESS}")
 SIGNER_API_URL=$(get_signer_api_url "${NETWORK}" "${SUPPORTED_NETWORKS}")
 BEACON_API_URL=$(get_beacon_api_url "${NETWORK}" "${SUPPORTED_NETWORKS}" "${CLIENT}")
 MEVBOOST_FLAG=$(get_mevboost_flag "${NETWORK}" "${MEVBOOST_FLAG_KEY}" "${SKIP_MEVBOOST_URL}")