diff --git a/docker-compose.yml b/docker-compose.yml
index cce7408..388d9d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,35 +13,29 @@ services:
       start_period: 10s
     ports:
       - 7000:6379
-  redis-node-0:
+  redis-node-0: &redis-node
     image: docker.io/bitnami/redis-cluster:7.2
     environment:
       ALLOW_EMPTY_PASSWORD: "yes"
       REDIS_NODES: "redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
 
   redis-node-1:
-    image: docker.io/bitnami/redis-cluster:7.2
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
-      REDIS_NODES: "redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5"
+    <<: *redis-node
 
   redis-node-2:
-    image: docker.io/bitnami/redis-cluster:7.2
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
-      REDIS_NODES: "redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5"
+    <<: *redis-node
 
   redis-node-3:
-    image: docker.io/bitnami/redis-cluster:7.2
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
-      REDIS_NODES: "redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5"
+    <<: *redis-node
 
   redis-node-4:
-    image: docker.io/bitnami/redis-cluster:7.2
-    environment:
-      ALLOW_EMPTY_PASSWORD: "yes"
-      REDIS_NODES: "redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5"
+    <<: *redis-node
 
   redis-node-5:
     image: docker.io/bitnami/redis-cluster:7.2
@@ -56,6 +50,12 @@ services:
       REDIS_NODES: "redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5"
       REDIS_CLUSTER_REPLICAS: 1
       REDIS_CLUSTER_CREATOR: "yes"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
     ports:
       - 7001:6379
 
@@ -77,5 +77,11 @@ services:
     environment:
       ALLOW_EMPTY_PASSWORD: "yes"
       REDIS_MASTER_HOST: "redis-master"
+    healthcheck:
+      test: ["CMD", "redis-cli", "-p", "26379", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
     ports:
       - 7002:26379