diff --git a/docker-compose.yml b/docker-compose.yml
index 2c404b7..30be86a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - "9092:9092"
       - "9644:9644"
     healthcheck:
-      test: ["CMD-SHELL", "rpk cluster health --brokers=localhost:9092 | grep -q 'Healthy:.*true' || exit 1"]
+      test: ["CMD", "rpk", "cluster", "health"]
       interval: 5s
       timeout: 5s
       retries: 12
@@ -56,7 +56,7 @@ services:
     volumes:
       - ./docker/clickhouse/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
     healthcheck:
-      test: ["CMD", "wget", "--spider", "-q", "http://localhost:8123/ping"]
+      test: ["CMD", "clickhouse-client", "--query", "SELECT 1"]
       interval: 5s
       timeout: 5s
       retries: 10