diff --git a/build/bin/wfccontrol.sh b/build/bin/wfccontrol.sh
index a292262..ef56aa7 100755
--- a/build/bin/wfccontrol.sh
+++ b/build/bin/wfccontrol.sh
@@ -59,7 +59,7 @@ case "$1" in
         done
         ;;
     *)
-        echo "WANFi Control and Billing Management System Service ... "
+        echo "WANFi Control and Billing System Service ... "
         echo "Usage: $0 start|stop|restart|status|version"
         exit 1
         ;;
diff --git a/build/bin/wfcsetup.sh b/build/bin/wfcsetup.sh
index 7bd9bba..9c527fd 100755
--- a/build/bin/wfcsetup.sh
+++ b/build/bin/wfcsetup.sh
@@ -283,7 +283,7 @@ EOF"
                 $0 rm network
                 ;;
             *)
-                echo "WANFi Control and Billing Management System Setup ... "
+                echo "WANFi Control and Billing System Setup ... "
                 echo "Usage: $0 rm [base|jar|modules|fe|network|all]"
                 exit 1 
                 ;;               
@@ -295,7 +295,7 @@ EOF"
         docker system prune -a
         ;;
     *)
-        echo "WANFi Control and Billing Management System Setup ... "
+        echo "WANFi Control and Billing System Setup ... "
         echo "Usage: $0 env|initdb|upgdb|base|jar|modules|fe|all|rm [base|jar|modules|fe|network|all]|prune"
         echo "       $0 env [IP]"
         echo "       $0 initdb"
diff --git a/build/docker/compose/docker-compose-debug.yml b/build/docker/compose/docker-compose-debug.yml
index d5285b8..a046347 100644
--- a/build/docker/compose/docker-compose-debug.yml
+++ b/build/docker/compose/docker-compose-debug.yml
@@ -193,7 +193,7 @@ services:
       test: ["CMD-SHELL", "curl -f http://localhost:${WFC_SYSTEM_PORT}/actuator/health || exit 1"]
       interval: 30s
       timeout: 10s
-      retries: 3                       
+      retries: 6                       
     restart: ${RESTART_OPTION} 
 
   wfc-modules-user:
@@ -232,7 +232,7 @@ services:
       test: ["CMD-SHELL", "curl -f http://localhost:${WFC_USER_PORT}/actuator/health || exit 1"]
       interval: 30s
       timeout: 10s
-      retries: 3      
+      retries: 6      
     restart: ${RESTART_OPTION}
 
   wfc-modules-file:
@@ -263,6 +263,11 @@ services:
       - WFC_FILE_PORT=${WFC_FILE_PORT}
       - SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/       
       - TZ=${TZ}
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:${WFC_FILE_PORT}/actuator/health || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 6        
     restart: ${RESTART_OPTION}
 
   wfc-modules-job:
@@ -293,6 +298,11 @@ services:
       - WFC_JOB_PORT=${WFC_JOB_PORT}
       - SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/ 
       - TZ=${TZ}
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:${WFC_JOB_PORT}/actuator/health || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 6        
     restart: ${RESTART_OPTION}
 
   wfc-modules-payment:
@@ -326,6 +336,11 @@ services:
       - WFC_PAYMENT_PORT=${WFC_PAYMENT_PORT}
       - SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
       - TZ=${TZ}
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:${WFC_PAYMENT_PORT}/actuator/health || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 6        
     restart: ${RESTART_OPTION} 
              
   wfc-nginx:
@@ -339,6 +354,7 @@ services:
       - wfc-fe-network      
       - wfc-be-network      
     volumes:
+      - ./wfc/modules/file/upload:/opt/wfc/file/upload
       - ./nginx/html/dist:/opt/wfc/portal
       - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
       - ./nginx/logs:/var/log/nginx
@@ -354,6 +370,16 @@ services:
       - WFC_SERVER_IP=${WFC_SERVER_IP}
       - WFC_SERVER_PORT=${WFC_SERVER_PORT}
       - TZ=${TZ}
+    healthcheck:
+      test:
+        - "CMD-SHELL"
+        - >
+          curl -f http://localhost:${WFC_SERVER_PORT}/sys &&
+          curl -f http://localhost:${WFC_SERVER_PORT}/u ||
+          exit 1
+      interval: 30s
+      timeout: 5s
+      retries: 6      
     restart: ${RESTART_OPTION}          
 
 networks:
diff --git a/build/systemd/system/wfccontrol.service b/build/systemd/system/wfccontrol.service
index 1faddd4..6088b54 100644
--- a/build/systemd/system/wfccontrol.service
+++ b/build/systemd/system/wfccontrol.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=WANFi Control and Billing Management System
+Description=WANFi Control and Billing System
 After=network.target 
 Requires=network.target