diff --git a/ansible/inventories/devnet-0/group_vars/all/all.yaml b/ansible/inventories/devnet-0/group_vars/all/all.yaml
index e330ccf..7041e95 100644
--- a/ansible/inventories/devnet-0/group_vars/all/all.yaml
+++ b/ansible/inventories/devnet-0/group_vars/all/all.yaml
@@ -358,7 +358,7 @@ otelcol_contrib_config: |
           format: docker
           add_metadata_from_filepath: true
         - type: filter
-          expr: 'attributes["container.name"] != nil and attributes["container.name"] matches "^(otelcol|ethereum-metrics-exporter|nginx-proxy|node_exporter|prometheus|snooper-.*)$"'
+          expr: '(attributes["container.name"] != nil and attributes["container.name"] matches "^(otelcol|ethereum-metrics-exporter|nginx-proxy|node_exporter|prometheus|snooper-.*)$") or body matches "github\\.com/open-telemetry/opentelemetry-collector-contrib|otelcol-contrib"'
         - type: json_parser
           if: 'body matches "^\\s*\\{"'
           on_error: send
diff --git a/ansible/inventories/devnet-0/group_vars/bootnode.yaml b/ansible/inventories/devnet-0/group_vars/bootnode.yaml
index 02ba28c..e444d9b 100644
--- a/ansible/inventories/devnet-0/group_vars/bootnode.yaml
+++ b/ansible/inventories/devnet-0/group_vars/bootnode.yaml
@@ -68,7 +68,7 @@ lighthouse_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
         )
@@ -111,7 +111,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 e4bd256..9ec5273 100644
--- a/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml
+++ b/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml
@@ -1,15 +1,15 @@
 ethereum_cl_bootnodes:
   - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}"
-  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}"
-  - "{{ hostvars['lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] }}"
-  - "{{ hostvars['lighthouse-geth-super-2']['ethereum_node_fact_cl_enr'] }}"
-  - "{{ hostvars['lighthouse-nimbusel-full-1']['ethereum_node_fact_cl_enr'] }}"
-  - "{{ hostvars['lighthouse-nimbusel-full-2']['ethereum_node_fact_cl_enr'] }}"
+  - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}"
+  - "{{ hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_cl_enr'] }}"
+  - "{{ hostvars['lighthouse-geth-super-2']['ethereum_node_fact_discovery_cl_enr'] }}"
+  - "{{ hostvars['lighthouse-nimbusel-full-1']['ethereum_node_fact_discovery_cl_enr'] }}"
+  - "{{ hostvars['lighthouse-nimbusel-full-2']['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 9d80644..c3bad69 100644
--- a/ansible/inventories/devnet-0/host_vars/mev-relay-1.yaml
+++ b/ansible/inventories/devnet-0/host_vars/mev-relay-1.yaml
@@ -144,10 +144,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