diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
index df11e52a..f59cca0b 100644
--- a/.github/workflows/smoke-test.yaml
+++ b/.github/workflows/smoke-test.yaml
@@ -71,7 +71,7 @@ jobs:
       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))
+        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"
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;