diff --git a/build/docker/compose/docker-compose-debug.yml b/build/docker/compose/docker-compose-debug.yml
index 561ce1d..d0c022f 100644
--- a/build/docker/compose/docker-compose-debug.yml
+++ b/build/docker/compose/docker-compose-debug.yml
@@ -17,10 +17,10 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "mysqladmin", "ping", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"]
+      test: ["CMD-SHELL", "mysqladmin ping -u root -p'${MYSQL_ROOT_PASSWORD}'"]
       interval: 10s
       timeout: 10s
-      retries: 5            
+      retries: 5             
     restart: ${RESTART_OPTION}
 
   wfc-redis:
@@ -37,7 +37,7 @@ services:
       - ./redis/data:/opt/wfc/redis/data
     command: redis-server /opt/wfc/redis/redis.conf
     healthcheck:
-      test: ["CMD-SHELL", "redis-cli", "ping"]
+      test: ["CMD-SHELL", "redis-cli ping"]
       interval: 10s
       timeout: 5s
       retries: 5      
diff --git a/build/docker/compose/docker-compose.yml b/build/docker/compose/docker-compose.yml
index bc8602f..9a19805 100644
--- a/build/docker/compose/docker-compose.yml
+++ b/build/docker/compose/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "mysqladmin", "ping", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"]
+      test: ["CMD-SHELL", "mysqladmin ping -u root -p'${MYSQL_ROOT_PASSWORD}'"]
       interval: 10s
       timeout: 10s
       retries: 5          
@@ -37,7 +37,7 @@ services:
       - ./redis/data:/opt/wfc/redis/data
     command: redis-server /opt/wfc/redis/redis.conf
     healthcheck:
-      test: ["CMD-SHELL", "redis-cli", "ping"]
+      test: ["CMD-SHELL", "redis-cli ping"]
       interval: 10s
       timeout: 5s
       retries: 5