diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
index f36ff004b2..d476929923 100644
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -24,7 +24,7 @@ jobs:
         image: scylladb/scylla
         ports:
           - 9042:9042
-        options: --health-cmd "cqlsh --debug" --health-interval 5s --health-retries 10
+        options: --health-cmd "cqlsh --debug scylladb" --health-interval 5s --health-retries 10
     steps:
     - uses: actions/checkout@v3
     - name: Install mdbook
diff --git a/test/cluster/docker-compose.yml b/test/cluster/docker-compose.yml
index 0fa1e04327..210cc0b738 100644
--- a/test/cluster/docker-compose.yml
+++ b/test/cluster/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       --smp 2
       --memory 1G
     healthcheck:
-      test: [ "CMD", "cqlsh", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla1", "-e", "select * from system.local" ]
       interval: 5s
       timeout: 5s
       retries: 60
@@ -41,7 +41,7 @@ services:
       --smp 2
       --memory 1G
     healthcheck:
-      test: [ "CMD", "cqlsh", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla2", "-e", "select * from system.local" ]
       interval: 5s
       timeout: 5s
       retries: 60
@@ -62,7 +62,7 @@ services:
       --smp 2
       --memory 1G
     healthcheck:
-      test: [ "CMD", "cqlsh", "-e", "select * from system.local" ]
+      test: [ "CMD", "cqlsh", "scylla3", "-e", "select * from system.local" ]
       interval: 5s
       timeout: 5s
       retries: 60