diff --git a/Dockerfile b/Dockerfile
index d73a4277cb6b0d9866cbfb14771b36afc017e7e1..e77f160ca22c02ed1327d1f986904e1f4508d691 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,10 +28,12 @@ COPY redis.conf /etc/redis/redis.conf
 
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 
-COPY run.sh /usr/bin/run.sh
+COPY setupMasterSlave.sh /usr/bin/setupMasterSlave.sh
 
 VOLUME ["/data"]
 
 WORKDIR /data
 
+EXPOSE 6379
+
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
diff --git a/Makefile b/Makefile
index 0b973e8dfaf93f161277f4ca51b412706602328c..17ce5322969d7e4ada1a03e291adaf628c14072b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ setup-standalone-server-compose:
 
 setup-cluster-compose:
 	docker-compose -f docker-compose.yaml up -d
-	docker-compose exec redis-master-3 /bin/bash -c "/usr/bin/run.sh"
-	docker-compose exec redis-slave-1 /bin/bash -c "/usr/bin/run.sh"
-	docker-compose exec redis-slave-2 /bin/bash -c "/usr/bin/run.sh"
-	docker-compose exec redis-slave-3 /bin/bash -c "/usr/bin/run.sh"
+	docker-compose exec redis-master-3 /bin/bash -c "/usr/bin/setupMasterSlave.sh"
+	docker-compose exec redis-slave-1 /bin/bash -c "/usr/bin/setupMasterSlave.sh"
+	docker-compose exec redis-slave-2 /bin/bash -c "/usr/bin/setupMasterSlave.sh"
+	docker-compose exec redis-slave-3 /bin/bash -c "/usr/bin/setupMasterSlave.sh"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index aee53dec27002681387b551e052578d090ce52eb..246fec67bc424c385abdf10f714627660734b760 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -10,6 +10,8 @@ services:
       REDIS_PASSWORD: "Opstree@12345"
       SETUP_MODE: cluster
       SERVER_MODE: master
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"]
 
   redis-master-2:
     image: opstree/redis:1.0
@@ -21,8 +23,8 @@ services:
       REDIS_PASSWORD: "Opstree@12345"
       SETUP_MODE: cluster
       SERVER_MODE: master
-    depends_on:
-      - redis-master-1
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"]
 
   redis-master-3:
     image: opstree/redis:1.0
@@ -35,9 +37,8 @@ services:
       SETUP_MODE: cluster
       SERVER_MODE: master
       MASTER_LIST: "10.5.0.2:6379 10.5.0.3:6379 10.5.0.4:6379"
-    depends_on:
-      - redis-master-1
-      - redis-master-2
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"]
 
   redis-slave-1:
     image: opstree/redis:1.0
@@ -51,10 +52,8 @@ services:
       SERVER_MODE: slave
       SLAVE_IP: "10.5.0.5:6379"
       MASTER_IP: "10.5.0.2:6379"
-    depends_on:
-      - redis-master-1
-      - redis-master-2
-      - redis-master-3
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"]
 
   redis-slave-2:
     image: opstree/redis:1.0
@@ -68,10 +67,8 @@ services:
       SERVER_MODE: slave
       SLAVE_IP: "10.5.0.6:6379"
       MASTER_IP: "10.5.0.3:6379"
-    depends_on:
-      - redis-master-1
-      - redis-master-2
-      - redis-master-3
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"]
 
   redis-slave-3:
     image: opstree/redis:1.0
@@ -85,10 +82,8 @@ services:
       SERVER_MODE: slave
       SLAVE_IP: "10.5.0.7:6379"
       MASTER_IP: "10.5.0.4:6379"
-    depends_on:
-      - redis-master-1
-      - redis-master-2
-      - redis-master-3
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD} ping"]
 
 networks:
   redis:
diff --git a/run.sh b/setupMasterSlave.sh
similarity index 100%
rename from run.sh
rename to setupMasterSlave.sh