diff --git a/.github/workflows/sentry-smoke-test.yaml b/.github/workflows/sentry-smoke-test.yaml
new file mode 100644
index 00000000..8c9accc2
--- /dev/null
+++ b/.github/workflows/sentry-smoke-test.yaml
@@ -0,0 +1,185 @@
+name: Sentry Smoke Test
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  sentry-smoke-test:
+    timeout-minutes: 20
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Build xatu image
+      run: |
+        docker build -t ethpandaops/xatu:local .
+        echo "Xatu image is built."
+    - name: Install Kurtosis
+      run: |
+        echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
+        sudo apt update
+        sudo apt install kurtosis-cli
+    - name: Create Kurtosis config file
+      run: |
+        cat <<EOF > network_params.yaml
+          participants:
+            - el_client_type: geth
+              cl_client_type: teku
+              cl_client_image: ethpandaops/teku:master-16c4354
+            - el_client_type: nethermind
+              cl_client_type: prysm
+            - el_client_type: erigon
+              cl_client_type: lighthouse
+            - el_client_type: besu
+              cl_client_type: lighthouse
+            - el_client_type: reth
+              cl_client_type: lodestar
+            - el_client_type: ethereumjs
+              cl_client_type: nimbus
+          additional_services: []
+          network_parans:
+            genesis_delay: 180
+          xatu_sentry_enabled: true
+          xatu_sentry_params:
+            xatu_server_addr: xatu-server:8080
+            xatu_sentry_image: ethpandaops/xatu:local
+            beacon_subscriptions:
+            - attestation
+            - block
+            - chain_reorg
+            - finalized_checkpoint
+            - head
+            - voluntary_exit
+            - contribution_and_proof
+        <<EOF
+
+    - name: Start Ethereum network with Kurtosis and Run Xatu stack in parallel
+      timeout-minutes: 20
+      shell: bash
+      run: |
+        echo "Starting Kurtosis..."
+        kurtosis run --enclave xatu github.com/kurtosis-tech/ethereum-package --args-file network_params.yaml & 
+        KURTOSIS_PID=$!
+
+        echo "Starting Xatu stack..."
+        docker compose up --detach --quiet-pull &
+        XATU_STACK_PID=$!
+
+        echo "Waiting for Kurtosis to start..."
+        wait $KURTOSIS_PID
+        KURTOSIS_EXIT_CODE=$?
+
+        if [ $KURTOSIS_EXIT_CODE -ne 0 ]; then
+          echo "Kurtosis failed to start."
+          exit $KURTOSIS_EXIT_CODE
+        fi
+
+        echo "Waiting for Xatu stack to start..."
+        wait $XATU_STACK_PID
+        XATU_STACK_EXIT_CODE=$?
+
+        if [ $XATU_STACK_EXIT_CODE -ne 0 ]; then
+          echo "Xatu stack failed to start."
+          exit $XATU_STACK_EXIT_CODE
+        fi
+
+        echo "Kurtosis and Xatu stack have started successfully."
+    - 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; docker restart $container; done
+    - name: Verify Clickhouse has data from all sentries
+      timeout-minutes: 10
+      run: |
+        echo "Checking Clickhouse for data from all sentries"
+
+        all_sentries=($(kurtosis enclave inspect xatu | grep cl- | grep http | awk '{ print $2 }' | grep -v validator | sed 's/^cl-//'))
+
+        tables=(
+            "beacon_api_eth_v1_events_attestation"
+            "beacon_api_eth_v1_events_block"
+            "beacon_api_eth_v1_events_head"
+        )
+
+        # Define a function that prints the last 5 logs from all docker containers that have the argument in the name
+        pretty_print() {
+            local message=$1
+            local color=$2
+            local no_color='\033[0m'
+            local green='\033[0;32m'
+            local red='\033[0;31m'
+            local bright_red='\033[1;31m'
+
+            # Choose color based on the type of message
+            if [ "$color" == "green" ]; then
+                color=$green
+            elif [ "$color" == "red" ]; then
+                color=$red
+            elif [ "$color" == "bright_red" ]; then
+                color=$bright_red
+            else
+                color=$no_color
+            fi
+
+            echo -e "${color}######################${no_color}"
+            echo -e "${color}      $message      ${no_color}"
+            echo -e "${color}######################${no_color}"
+        }
+
+        print_logs() {
+            for container in $(docker ps --filter name=$1 --format "{{.Names}}"); do
+                echo "Logs for $container:\n\n"
+                docker logs --tail 5 $container
+            done
+        }
+
+        # Check for any data in the tables before digging in to the individual sentries
+        for table in "${tables[@]}"; do
+            pretty_print "Checking $table table..." "none"
+            data_count=$(docker exec clickhouse-01 clickhouse-client --query "SELECT COUNT(*) FROM default.$table" || true)
+            if [[ $data_count -gt 0 ]]; then
+                pretty_print "$table table has $data_count entries" "green"
+            else
+                pretty_print "$table table has no entries." "bright_red"
+
+                print_logs xatu-server
+                print_logs vector
+            fi
+        done
+
+        for table in "${tables[@]}"; do
+            pretty_print "Checking $table table..." "none"
+            for sentry in "${all_sentries[@]}"; do
+                pretty_print "Checking $table table for $sentry..." "none"
+                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
+                        pretty_print "$table has $data_count entries from $sentry" "green"
+                        break
+                    else
+                        pretty_print "$table has no entries from $sentry." "bright_red"
+
+                        print_logs $sentry
+
+                        sleep 5
+                    fi
+                done
+            done
+        done
+
+    - name: Collect docker logs on failure
+      if: failure()
+      uses: jwalton/gh-docker-logs@v2
+      with:
+        dest: './logs'
+    - name: Tar logs
+      if: failure()
+      run: tar cvzf ./logs.tgz ./logs
+    - name: Upload logs to GitHub
+      if: failure()
+      uses: actions/upload-artifact@master
+      with:
+        name: logs.tgz
+        path: ./logs.tgz
\ No newline at end of file
diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
deleted file mode 100644
index c19f8b29..00000000
--- a/.github/workflows/smoke-test.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-# name: Smoke Test
-
-# on:
-#   pull_request:
-
-# jobs:
-#   smoke-test:
-#     runs-on: ubuntu-latest
-#     steps:
-#     - name: Checkout repository
-#       uses: actions/checkout@v2
-#     - name: Build xatu image
-#       run: |
-#         docker build -t ethpandaops/xatu:latest .
-#         echo "Xatu image is built."
-#     - name: Install Kurtosis
-#       run: |
-#         echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
-#         sudo apt update
-#         sudo apt install kurtosis-cli
-#     - name: Create Kurtosis config file
-#       run: |
-#         cat <<EOF > network_params.yaml
-#           participants:
-#             - el_client_type: geth
-#               cl_client_type: teku
-#             - el_client_type: nethermind
-#               cl_client_type: prysm
-#             - el_client_type: erigon
-#               cl_client_type: lighthouse
-#             - el_client_type: besu
-#               cl_client_type: lighthouse
-#             - el_client_type: reth
-#               cl_client_type: lodestar
-#             - el_client_type: ethereumjs
-#               cl_client_type: nimbus
-#           additional_services: []
-#           network_parans:
-#             genesis_delay: 60
-#         <<EOF
-#     - name: Start Ethereum network with Kurtosis
-#       run: |
-#         kurtosis run --enclave xatu github.com/kurtosis-tech/ethereum-package "$(cat network_params.yaml)"
-#     - name: Run Xatu stack
-#       run: |
-#         docker compose up --detach --quiet-pull;
-#         echo "Xatu stack is running."
-#     - name: Create Xatu Sentry for every participant
-#       run: |
-#         export services=$(kurtosis enclave inspect xatu | grep cl- | grep http | awk '{ print $2 }' | grep -v validator)
-#         readarray -t BEACON_SERVICES <<< "$services";
-#         echo "Beacon nodes discovered: $BEACON_SERVICES"
-
-#         for service in "${BEACON_SERVICES[@]}"; do
-#           port=$(kurtosis port print xatu $service http)
-#           echo "Creating Xatu Sentry for $service which is running at $port..."
-#           cat <<EOF > "${service}.yaml"
-#             name: $service
-#             ethereum:
-#               beaconNodeAddress: $port
-#               overrideNetworkName: "xatu-devnet"
-#             forkChoice:
-#               enabled: true
-            
-#               onReOrgEvent:
-#                 enabled: true
-                          
-#               at:
-#                 enabled: true
-#                 slotTimes:
-#                 - 4s
-            
-#             attestationData:
-#               enabled: true
-            
-#               at:
-#                 enabled: true
-#                 slotTimes:
-#                 - 4s
-            
-#             beaconCommittees:
-#               enabled: true
-#             output:
-#             - name: xatu
-#               type: xatu
-#               config:
-#                 address: xatu-server:8080
-#                 tls: false
-#         <<EOF
-
-#           cat "${service}.yaml";
-
-#           docker run -d -v "$(pwd)/${service}.yaml:/opt/config.yaml" --network=xatu_xatu-net ethpandaops/xatu:latest sentry --config /opt/config.yaml;
-
-#         done
-#     - name: Check Clickhouse for attestation data from every participant
-#       run: |
-#         export services=$(kurtosis enclave inspect xatu | grep cl- | grep http | awk '{ print $2 }' | grep -v validator)
-#         readarray -t BEACON_SERVICES <<< "$services";
-
-#         for service in "${BEACON_SERVICES[@]}"; do
-#             echo "Checking Clickhouse for attestation data from $service..."
-#             while true; do
-#                 if docker --network xatu_xatu-net exec clickhouse-01 clickhouse-client --query "SELECT COUNT(*) FROM default.beacon_api_eth_v1_events_attestation WHERE event_date_time > now() - INTERVAL 1 HOUR AND meta_client_name == '$service"; then
-#                     echo "Attestations table has data."
-#                     break
-#                 else
-#                     echo "Attestations table is empty. Checking again in 2 seconds..."
-#                     sleep 2
-#                 fi
-#             done
-#             echo "Attestation data from $service is present"
-#         done
-
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:
diff --git a/deploy/migrations/clickhouse/025_rm_beacon_attestation_signature.up.sql b/deploy/migrations/clickhouse/025_rm_beacon_attestation_signature.up.sql
index dd5c80c9..0fd59040 100644
--- a/deploy/migrations/clickhouse/025_rm_beacon_attestation_signature.up.sql
+++ b/deploy/migrations/clickhouse/025_rm_beacon_attestation_signature.up.sql
@@ -1,12 +1,11 @@
-ALTER TABLE default.beacon_api_eth_v1_events_attestation_local ON CLUSTER '{cluster}'
+ALTER TABLE default.beacon_p2p_attestation_local ON CLUSTER '{cluster}'
 DROP COLUMN signature;
 
-ALTER TABLE default.beacon_api_eth_v1_events_attestation ON CLUSTER '{cluster}'
+ALTER TABLE default.beacon_p2p_attestation ON CLUSTER '{cluster}'
 DROP COLUMN signature;
 
-
-ALTER TABLE default.beacon_p2p_attestation_local ON CLUSTER '{cluster}'
+ALTER TABLE default.beacon_api_eth_v1_events_attestation_local ON CLUSTER '{cluster}'
 DROP COLUMN signature;
 
-ALTER TABLE default.beacon_p2p_attestation ON CLUSTER '{cluster}'
+ALTER TABLE default.beacon_api_eth_v1_events_attestation ON CLUSTER '{cluster}'
 DROP COLUMN signature;
diff --git a/docker-compose.yml b/docker-compose.yml
index abea6614..54e8fdfe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       test: ["CMD-SHELL", "set -x; wget --spider --quiet http://clickhouse-01:9000 || exit 1; wget --spider --quiet --header 'Host: localhost' --post-data 'query=SELECT 1' http://localhost:8123 || exit 1"]
       interval: 5s
       timeout: 10s
-      retries: 10
+      retries: 15
       start_period: 15s
   clickhouse-02:
     image: "clickhouse/clickhouse-server:${CHVER:-latest}"
@@ -55,7 +55,7 @@ services:
       test: ["CMD-SHELL", "set -x; wget --spider --quiet http://clickhouse-02:9000 || exit 1; wget --spider --quiet --header 'Host: localhost' --post-data 'query=SELECT 1' http://localhost:8123 || exit 1"]
       interval: 5s
       timeout: 10s
-      retries: 10
+      retries: 15
       start_period: 15s
   clickhouse-keeper-01:
     image: "clickhouse/clickhouse-keeper:${CHKVER:-latest-alpine}"