diff --git a/ansible/inventories/devnet-7/group_vars/all/all.yaml b/ansible/inventories/devnet-7/group_vars/all/all.yaml
index ea1d8bf..fab6342 100644
--- a/ansible/inventories/devnet-7/group_vars/all/all.yaml
+++ b/ansible/inventories/devnet-7/group_vars/all/all.yaml
@@ -240,49 +240,35 @@ xatu_sentry_config_server_auth_user: "{{ secret_xatu_sentry.user }}"
 xatu_sentry_config_server_auth_password: "{{ secret_xatu_sentry.password }}"
 xatu_sentry_config_network_name_override: "{{ ethereum_network_name }}"
 
-# Full config override: adds the Gloas SSE topics, which the sentry's default
-# subscription set deliberately excludes.
-xatu_sentry_config: |
-  logging: "info"
-  metricsAddr: ":9090"
-  name: "{{ xatu_sentry_config_name }}"
+# The sentry's default subscription set deliberately excludes the Gloas SSE
+# topics; list the full set explicitly.
+xatu_sentry_config_beacon_subscriptions:
+  - attestation
+  - single_attestation
+  - block
+  - block_gossip
+  - chain_reorg
+  - finalized_checkpoint
+  - head
+  - head_v2
+  - voluntary_exit
+  - contribution_and_proof
+  - blob_sidecar
+  - data_column_sidecar
+  - execution_payload
+  - execution_payload_gossip
+  - execution_payload_available
+  - execution_payload_bid
+  - payload_attestation_message
+  - proposer_preferences
+# Head-speed committee/duty streams keep the lab's attestation tables
+# tracking the head instead of trailing finality.
+xatu_sentry_config_beacon_committees_enabled: true
+xatu_sentry_config_proposer_duty_enabled: true
+xatu_sentry_config_output_max_queue_size: 100000
+xatu_sentry_config_output_workers: 5
+xatu_sentry_config_extra:
   ntpServer: time.google.com
-  ethereum:
-    beaconNodeAddress: {{ xatu_sentry_config_beacon_uri }}
-    overrideNetworkName: {{ xatu_sentry_config_network_name_override }}
-    beaconSubscriptions:
-      - attestation
-      - single_attestation
-      - block
-      - block_gossip
-      - chain_reorg
-      - finalized_checkpoint
-      - head
-      - head_v2
-      - voluntary_exit
-      - contribution_and_proof
-      - blob_sidecar
-      - data_column_sidecar
-      - execution_payload
-      - execution_payload_gossip
-      - execution_payload_available
-      - execution_payload_bid
-      - payload_attestation_message
-      - proposer_preferences
-  beaconCommittees:
-    enabled: true
-  proposerDuty:
-    enabled: true
-  outputs:
-  - name: grpc
-    type: xatu
-    config:
-      address: {{ xatu_sentry_config_server_address }}
-      tls: {{ xatu_sentry_config_server_tls_enabled }}
-      maxQueueSize: 100000
-      workers: 5
-      headers:
-        authorization: "Basic {{ (xatu_sentry_config_server_auth_user + ":" + xatu_sentry_config_server_auth_password) | b64encode }}"
 
 # role: ethpandaops.general.ethereum_metrics_exporter
 ethereum_metrics_exporter_container_image: "{{ default_tooling_images.ethereum_metrics_exporter }}"
diff --git a/ansible/inventories/devnet-7/group_vars/xatu.yaml b/ansible/inventories/devnet-7/group_vars/xatu.yaml
deleted file mode 100644
index 5f5f3af..0000000
--- a/ansible/inventories/devnet-7/group_vars/xatu.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-# role: ethpandaops.general.xatu_sentry
-xatu_sentry_config_name: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
-xatu_sentry_config_server_address: "{{ secret_xatu_sentry.server_address }}"
-xatu_sentry_config_server_auth_user: "{{ secret_xatu_sentry.user }}"
-xatu_sentry_config_server_auth_password: "{{ secret_xatu_sentry.password }}"
-xatu_sentry_config_network_name_override: "{{ ethereum_network_name }}"
-xatu_sentry_container_networks: "{{ docker_networks_shared }}"
-xatu_sentry_container_image: "{{ default_tooling_images.xatu_sentry }}"
-
-ethereum_node_xatu_sentry_enabled: true
-
-xatu_sentry_container_command:
-  - sentry
-  - --config=/config.yaml
-
-xatu_sentry_config:
-  logging: info
-  metricsAddr: :9090
-  name: "{{ xatu_sentry_config_name }}"
-  ntpServer: time.google.com
-  ethereum:
-    beaconNodeAddress: http://{{ vars[ethereum_node_cl + '_container_name'] }}:{{ethereum_node_cl_ports_http_beacon}}
-    overrideNetworkName: "{{ xatu_sentry_config_network_name_override }}"
-    beaconSubscriptions:
-      - attestation
-      - block
-      - block_gossip
-      - chain_reorg
-      - finalized_checkpoint
-      - head
-      - voluntary_exit
-      - contribution_and_proof
-      - blob_sidecar
-      - data_column_sidecar
-  attestationData:
-    enabled: false
-  beaconCommittees:
-    enabled: true
-  proposerDuty:
-    enabled: true
-  forkChoice:
-    enabled: false
-  outputs:
-    - config:
-        address: "{{ xatu_sentry_config_server_address }}"
-        headers:
-          authorization: Basic {{ (xatu_sentry_config_server_auth_user + ':' + xatu_sentry_config_server_auth_password) | b64encode }}
-        maxExportBatchSize: 32
-        maxQueueSize: 1000000
-        workers: 5
-        tls: true
-      filter:
-        eventNames:
-          - BEACON_API_ETH_V1_EVENTS_UNKNOWN
-          - BEACON_API_ETH_V1_BEACON_COMMITTEE
-          - BEACON_API_ETH_V1_EVENTS_BLOB_SIDECAR
-          - BEACON_API_ETH_V1_EVENTS_BLOCK
-          - BEACON_API_ETH_V1_EVENTS_BLOCK_V2
-          - BEACON_API_ETH_V1_EVENTS_BLOCK_GOSSIP
-          - BEACON_API_ETH_V1_EVENTS_CHAIN_REORG
-          - BEACON_API_ETH_V1_EVENTS_CHAIN_REORG_V2
-          - BEACON_API_ETH_V1_EVENTS_FINALIZED_CHECKPOINT
-          - BEACON_API_ETH_V1_EVENTS_FINALIZED_CHECKPOINT_V2
-          - BEACON_API_ETH_V1_EVENTS_HEAD
-          - BEACON_API_ETH_V1_EVENTS_HEAD_V2
-          - BEACON_API_ETH_V1_EVENTS_VOLUNTARY_EXIT
-          - BEACON_API_ETH_V1_EVENTS_VOLUNTARY_EXIT_V2
-          - BEACON_API_ETH_V1_EVENTS_CONTRIBUTION_AND_PROOF
-          - BEACON_API_ETH_V1_EVENTS_CONTRIBUTION_AND_PROOF_V2
-          - BEACON_API_ETH_V1_VALIDATOR_ATTESTATION_DATA
-          - MEMPOOL_TRANSACTION
-          - MEMPOOL_TRANSACTION_V2
-          - BEACON_API_ETH_V2_BEACON_BLOCK
-          - BEACON_API_ETH_V2_BEACON_BLOCK_V2
-      name: grpc-general
-      type: xatu
-    - config:
-        address: "{{ xatu_sentry_config_server_address }}"
-        headers:
-          authorization: Basic {{ (xatu_sentry_config_server_auth_user + ':' + xatu_sentry_config_server_auth_password) | b64encode }}
-        maxExportBatchSize: 128
-        maxQueueSize: 1000000
-        workers: 10
-        tls: true
-      filter:
-        eventNames:
-          - BEACON_API_ETH_V1_EVENTS_ATTESTATION
-          - BEACON_API_ETH_V1_EVENTS_ATTESTATION_V2
-      name: grpc-attestation
-      type: xatu
diff --git a/ansible/inventories/devnet-7/group_vars/xatu_sentry.yaml b/ansible/inventories/devnet-7/group_vars/xatu_sentry.yaml
deleted file mode 100644
index f49b32b..0000000
--- a/ansible/inventories/devnet-7/group_vars/xatu_sentry.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ethereum_node_xatu_sentry_enabled: true