diff --git a/ansible/inventories/devnet-0/group_vars/bootnode.yaml b/ansible/inventories/devnet-0/group_vars/bootnode.yaml
index b4d13c1..3d3cdae 100644
--- a/ansible/inventories/devnet-0/group_vars/bootnode.yaml
+++ b/ansible/inventories/devnet-0/group_vars/bootnode.yaml
@@ -70,7 +70,7 @@ teku_container_command_extra_args:
       (
         (
           groups['bootnode']
-          | map('extract', hostvars, ['ethereum_node_fact_cl_enr'])
+          | map('extract', hostvars, ['ethereum_node_fact_discovery_cl_enr'])
           | select('defined')
           | list
         )
@@ -109,7 +109,7 @@ geth_container_command_extra_args:
       (
         (
           groups['bootnode']
-          | map('extract', hostvars, ['ethereum_node_fact_el_enode'])
+          | map('extract', hostvars, ['ethereum_node_fact_discovery_el_enode'])
           | select('defined')
           | list
         )
diff --git a/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml
index ace3e6b..67c073f 100644
--- a/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml
+++ b/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml
@@ -1,10 +1,10 @@
 ethereum_cl_bootnodes:
   - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}"
-  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}"
+  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}"
 
 ethereum_el_bootnodes:
   - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enode'] }}"
-  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] }}"
+  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] }}"
 
 ethereum_node_xatu_sentry_enabled: true
 
diff --git a/ansible/inventories/devnet-0/host_vars/mev-relay-1.yaml b/ansible/inventories/devnet-0/host_vars/mev-relay-1.yaml
index f5738be..20fdc76 100644
--- a/ansible/inventories/devnet-0/host_vars/mev-relay-1.yaml
+++ b/ansible/inventories/devnet-0/host_vars/mev-relay-1.yaml
@@ -138,10 +138,10 @@ lighthouse_validator_datadir: /data/lighthouse-validator
 lighthouse_container_pull: true
 
 ethereum_el_bootnodes:
-  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] }}"
+  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] }}"
 
 ethereum_cl_bootnodes:
-  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}"
+  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}"
 
 # role: ethpandaops.general.ethereum_node
 ethereum_node_el: reth