diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
index 1df7c45f..8c992cc7 100644
--- a/.github/workflows/smoke-test.yaml
+++ b/.github/workflows/smoke-test.yaml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Add all xatu-sentry containers to the xatu network
       run: |
-        for container in $(docker ps --filter name=xatu-sentry --format "{{.Names}}"); do docker network connect xatu_xatu-net $container; echo $container; done
+        for container in $(docker ps --filter name=xatu-sentry --format "{{.Names}}"); do docker network connect xatu_xatu-net $container; echo $container; docker restart $container; done
     - name: Verify Clickhouse has data from all sentries
       timeout-minutes: 10
       run: |
@@ -79,6 +79,20 @@ jobs:
             "beacon_api_eth_v1_events_head"
         )
 
+        # Check for any data in the tables before digging in to the individual sentries
+        for table in "${tables[@]}"; do
+            echo "Checking $table table..."
+            data_count=$(docker exec clickhouse-01 clickhouse-client --query "SELECT COUNT(*) FROM default.$table" || true)
+            if [[ $data_count -gt 0 ]]; then
+                echo "$table table has $data_count entries"
+            else
+                echo "$table table has no entries."
+
+                print_logs xatu-server
+                print_logs vector
+            fi
+        done
+
         # Define a function that prints the last 5 logs from all docker containers that have the argument in the name
         print_logs() {
             for container in $(docker ps --filter name=$1 --format "{{.Names}}"); do
@@ -95,7 +109,7 @@ jobs:
                 while true; do
                     data_count=$(docker exec clickhouse-01 clickhouse-client --query "SELECT COUNT(*) FROM default.$table WHERE meta_client_name = '$sentry'" || true)
                     if [[ $data_count -gt 0 ]]; then
-                        echo "$table table has data from $sentry."
+                        echo "$table table has $data_count entries in $table from $sentry"
                         break
                     else
                         echo "$table table data count for $sentry is $data_count."
diff --git a/deploy/local/docker-compose/vector-http-kafka.yaml b/deploy/local/docker-compose/vector-http-kafka.yaml
index 561973c8..d414801d 100644
--- a/deploy/local/docker-compose/vector-http-kafka.yaml
+++ b/deploy/local/docker-compose/vector-http-kafka.yaml
@@ -2,6 +2,8 @@ api:
   enabled: true
   address: 0.0.0.0:8686
   playground: false
+acknowledgements:
+  enabled: true
 sources:
   xatu_server_events_http:
     address: 0.0.0.0:9005
@@ -63,13 +65,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_beacon_committee
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-beacon-committee
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -79,13 +81,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_head
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-head
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -95,13 +97,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_head_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-head-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -111,13 +113,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_blob_sidecar
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-blob-sidecar
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -127,13 +129,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_block
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-block
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -143,13 +145,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_block_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-block-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -159,13 +161,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_attestation
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-attestation
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -175,13 +177,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_attestation_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-attestation-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -191,13 +193,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_validator_attestation_data
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-validator-attestation-data
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -207,13 +209,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_voluntary_exit
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-voluntary-exit
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -223,13 +225,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_voluntary_exit_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-voluntary-exit-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -239,13 +241,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_finalized_checkpoint
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-finalized-checkpoint
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -255,13 +257,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_finalized_checkpoint_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-finalized-checkpoint-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -271,13 +273,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_chain_reorg
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-chain-reorg
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -287,13 +289,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_chain_reorg_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-chain-reorg-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -303,13 +305,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_contribution_and_proof
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-contribution-and-proof
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -319,13 +321,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_events_contribution_and_proof_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-events-contribution-and-proof-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -335,13 +337,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.mempool_transaction
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: mempool-transaction
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -351,13 +353,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.mempool_transaction_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: mempool-transaction-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -367,13 +369,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -385,13 +387,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -403,13 +405,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_debug_fork_choice
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-debug-fork-choice
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -421,13 +423,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_debug_fork_choice_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-debug-fork-choice-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -439,13 +441,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_debug_fork_choice_reorg
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-debug-fork-choice-reorg
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -457,13 +459,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_debug_fork_choice_reorg_v2
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-debug-fork-choice-reorg-v2
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -475,13 +477,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_proposer_slashing
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-proposer-slashing
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -491,13 +493,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_attester_slashing
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-attester-slashing
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -507,13 +509,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_bls_to_execution_change
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-bls-to-execution-change
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -523,13 +525,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_execution_transaction
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-execution-transaction
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -541,13 +543,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_voluntary_exit
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-voluntary-exit
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -557,13 +559,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_deposit
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-deposit
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -573,13 +575,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_withdrawal
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-withdrawal
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -589,13 +591,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.blockprint_block_classification
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: blockprint-block-classification
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -605,13 +607,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_beacon_blob_sidecar
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-beacon-blob-sidecar
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -623,13 +625,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.beacon_p2p_attestation
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-p2p-attestation
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -639,13 +641,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v1_proposer_duty
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v1-proposer-duty
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
@@ -655,13 +657,13 @@ sinks:
     type: kafka
     buffer:
       max_events: 500000
+    batch:
+      timeout_secs: 0.5
     inputs:
       - xatu_server_events_router.eth_v2_beacon_block_elaborated_attestation
     bootstrap_servers: "${KAFKA_BROKERS}"
     key_field: "event.id"
     topic: beacon-api-eth-v2-beacon-block-elaborated-attestation
-    acknowledgements:
-      enabled: false
     compression: snappy
     healthcheck:
       enabled: true
diff --git a/deploy/local/docker-compose/vector-kafka-clickhouse.yaml b/deploy/local/docker-compose/vector-kafka-clickhouse.yaml
index 0fb56fb7..e36eb2f6 100644
--- a/deploy/local/docker-compose/vector-kafka-clickhouse.yaml
+++ b/deploy/local/docker-compose/vector-kafka-clickhouse.yaml
@@ -2,13 +2,13 @@ api:
   enabled: true
   address: 0.0.0.0:8686
   playground: false
+acknowledgements:
+  enabled: true
 sources:
   internal_metrics:
     type: internal_metrics
   beacon_api_eth_v1_beacon_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     group_id: xatu-vector-kafka-clickhouse-beacon-api-eth-v1-beacon
     key_field: "event.id"
@@ -21,8 +21,6 @@ sources:
       message.max.bytes: "10485760" # 10MB
   beacon_api_eth_v1_events_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     group_id: xatu-vector-kafka-clickhouse-beacon-api-eth-v1-events
     key_field: "event.id"
@@ -35,8 +33,6 @@ sources:
       message.max.bytes: "10485760" # 10MB
   beacon_api_eth_v1_validator_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     group_id: xatu-vector-kafka-clickhouse-beacon-api-eth-v1-validator
     key_field: "event.id"
@@ -49,8 +45,6 @@ sources:
       message.max.bytes: "10485760" # 10MB
   mempool_transaction_events_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     group_id: xatu-vector-kafka-clickhouse-mempool-transaction-events
     key_field: "event.id"
@@ -61,8 +55,6 @@ sources:
       - "^mempool-transaction.+"
   beacon_api_eth_v2_beacon_block_events_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     auto_offset_reset: earliest
     group_id: xatu-vector-kafka-clickhouse-beacon-api-eth-v2-beacon-block-events
@@ -75,8 +67,6 @@ sources:
       message.max.bytes: "10485760" # 10MB
   blockprint_block_classification_events_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     group_id: xatu-vector-kafka-clickhouse-blockprint-block-classification-events
     key_field: "event.id"
@@ -87,8 +77,6 @@ sources:
       - "blockprint-block-classification"
   beacon_api_eth_v1_beacon_blob_sidecar_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     auto_offset_reset: earliest
     group_id: xatu-vector-kafka-clickhouse-beacon-api-eth-v1-beacon-blob-sidecar-events
@@ -101,8 +89,6 @@ sources:
       message.max.bytes: "10485760" # 10MB
   beacon_p2p_events_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     group_id: xatu-vector-kafka-clickhouse-beacon-p2p-events
     key_field: "event.id"
@@ -113,8 +99,6 @@ sources:
       - "^beacon-p2p.+"
   beacon_api_eth_v1_proposer_kafka:
     type: kafka
-    acknowledgements:
-      enabled: false
     bootstrap_servers: "${KAFKA_BROKERS}"
     group_id: xatu-vector-kafka-clickhouse-beacon-api-eth-v1-proposer
     key_field: "event.id"
@@ -1724,12 +1708,10 @@ sinks:
     database: default
     endpoint: "${CLICKHOUSE_ENDPOINT}"
     table: beacon_api_eth_v1_beacon_committee
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 1000000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 1000000
     healthcheck:
@@ -1746,12 +1728,10 @@ sinks:
     database: default
     endpoint: "${CLICKHOUSE_ENDPOINT}"
     table: beacon_api_eth_v1_events_head
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1768,12 +1748,10 @@ sinks:
     database: default
     endpoint: "${CLICKHOUSE_ENDPOINT}"
     table: beacon_api_eth_v1_events_blob_sidecar
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1790,12 +1768,10 @@ sinks:
     database: default
     endpoint: "${CLICKHOUSE_ENDPOINT}"
     table: beacon_api_eth_v1_events_block
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1812,12 +1788,10 @@ sinks:
     database: default
     endpoint: "${CLICKHOUSE_ENDPOINT}"
     table: beacon_api_eth_v1_events_attestation
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 1000000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 1000000
     healthcheck:
@@ -1834,12 +1808,10 @@ sinks:
     database: default
     endpoint: "${CLICKHOUSE_ENDPOINT}"
     table: beacon_api_eth_v1_validator_attestation_data
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1856,12 +1828,10 @@ sinks:
     database: default
     endpoint: "${CLICKHOUSE_ENDPOINT}"
     table: beacon_api_eth_v1_events_voluntary_exit
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1878,12 +1848,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1900,12 +1868,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1922,12 +1888,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1944,12 +1908,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1966,12 +1928,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -1988,12 +1948,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2010,12 +1968,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2032,12 +1988,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2054,12 +2008,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2076,12 +2028,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2098,12 +2048,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2120,12 +2068,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2142,12 +2088,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2164,12 +2108,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2186,12 +2128,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2208,12 +2148,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 1000000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 1000000
     healthcheck:
@@ -2230,12 +2168,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck:
@@ -2252,12 +2188,10 @@ sinks:
       strategy: basic
       user: "${CLICKHOUSE_USER}"
       password: "${CLICKHOUSE_PASSWORD}"
-    acknowledgements:
-      enabled: false
     batch:
       max_bytes: 52428800
       max_events: 200000
-      timeout_secs: 5
+      timeout_secs: 1
     buffer:
       max_events: 200000
     healthcheck: