diff --git a/beacon-chain/entrypoint.sh b/beacon-chain/entrypoint.sh
index e54f477..1a9ed1f 100755
--- a/beacon-chain/entrypoint.sh
+++ b/beacon-chain/entrypoint.sh
@@ -7,7 +7,7 @@ MEVBOOST_FLAG_KEYS="--builder-endpoint"
 . /etc/profile
 
 ENGINE_URL="http://execution.${NETWORK}.staker.dappnode:8551"
-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_KEYS}")
 
 if [ -n "${CHECKPOINT_SYNC_URL}" ]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index 98178f8..c47e7bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
         DATA_DIR: /opt/teku/data
     environment:
       CHECKPOINT_SYNC_URL: ""
-      FEE_RECIPIENT: ""
+      FEE_RECIPIENT_ADDRESS: ""
       EXTRA_OPTS: ""
       JAVA_OPTS: "-Xmx6g"
     restart: unless-stopped
@@ -26,7 +26,7 @@ services:
       LOG_LEVEL: INFO
       GRAFFITI: validating_from_DAppNode
       EXTRA_OPTS: ""
-      FEE_RECIPIENT: ""
+      FEE_RECIPIENT_ADDRESS: ""
       JAVA_OPTS: "-Xmx6g"
     restart: unless-stopped
     security_opt:
diff --git a/setup-wizard.yml b/setup-wizard.yml
index 0b3e023..441c303 100644
--- a/setup-wizard.yml
+++ b/setup-wizard.yml
@@ -22,7 +22,7 @@ fields:
   - id: feeRecipientAddress
     target:
       type: environment
-      name: FEE_RECIPIENT
+      name: FEE_RECIPIENT_ADDRESS
       service: [validator, beacon-chain]
     title: Fee Recipient Address
     description: >-
diff --git a/validator/entrypoint.sh b/validator/entrypoint.sh
index f1e4bd0..2f5d522 100755
--- a/validator/entrypoint.sh
+++ b/validator/entrypoint.sh
@@ -10,7 +10,7 @@ CLIENT="teku"
 . /etc/profile
 
 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_FLAGS=$(get_mevboost_flag "${NETWORK}" "${MEVBOOST_FLAG_KEYS}" "${SKIP_MEVBOOST_URL}")