diff --git a/charts/celeborn/values.yaml b/charts/celeborn/values.yaml
index 37c6962c8..fc756a219 100644
--- a/charts/celeborn/values.yaml
+++ b/charts/celeborn/values.yaml
@@ -128,7 +128,7 @@ environments:
   CELEBORN_WORKER_MEMORY: 2g
   CELEBORN_WORKER_OFFHEAP_MEMORY: 12g
   CELEBORN_WORKER_JAVA_OPTS: "-XX:-PrintGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:gc-worker.out -Dio.netty.leakDetectionLevel=advanced"
-  CELEBORN_NO_DAEMONIZE: 1
+  CELEBORN_NO_DAEMONIZE: true
   TZ: "Asia/Shanghai"
 
 # -- Specifies the DNS policy for Celeborn pods to use
diff --git a/conf/celeborn-env.sh.template b/conf/celeborn-env.sh.template
index c7d8eb190..38a6ea46a 100755
--- a/conf/celeborn-env.sh.template
+++ b/conf/celeborn-env.sh.template
@@ -23,8 +23,11 @@
 # - CELEBORN_WORKER_JAVA_OPTS
 # - CELEBORN_PID_DIR
 # - CELEBORN_LOG_DIR
+# - CELEBORN_SSH_OPTS, ssh opts for `start-all` and `stop-all` operations
+# - CELEBORN_SLEEP, Waiting time for `start-all` and `stop-all` operations (e.g. 5, 5s, 5m)
 # - CELEBORN_PREFER_JEMALLOC, to enable jemalloc memory allocator
 # - CELEBORN_JEMALLOC_PATH, to set jemalloc library path
+# - CELEBORN_NO_DAEMONIZE, set `true` to run the proposed command in the foreground
 
 # Example:
 # CELEBORN_MASTER_MEMORY=2g
@@ -34,5 +37,8 @@
 # CELEBORN_MASTER_JAVA_OPTS="-XX:-PrintGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:gc-master.out -Dio.netty.leakDetectionLevel=advanced"
 # CELEBORN_PID_DIR="$CELEBORN_HOME/pids"
 # CELEBORN_LOG_DIR="$CELEBORN_HOME/logs"
+# CELEBORN_SLEEP="5s"
+# CELEBORN_SSH_OPTS="-o StrictHostKeyChecking=no"
 # CELEBORN_PREFER_JEMALLOC="true"
 # CELEBORN_JEMALLOC_PATH="/path/to/libjemalloc.so"
+# CELEBORN_NO_DAEMONIZE="true"
diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index c657f32b5..4ff9c3b23 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -138,21 +138,22 @@ end="<!--end-include-->"
 
 Recommend configuring in `conf/celeborn-env.sh`.
 
-| Key                              | Default                                         | Description                                            |
-|----------------------------------|-------------------------------------------------|--------------------------------------------------------|
-| `CELEBORN_HOME`                  | ``$(cd "`dirname "$0"`"/..; pwd)``              |                                                        |
-| `CELEBORN_CONF_DIR`              | `${CELEBORN_CONF_DIR:-"${CELEBORN_HOME}/conf"}` |                                                        |
-| `CELEBORN_MASTER_MEMORY`         | 1 GB                                            |                                                        |
-| `CELEBORN_WORKER_MEMORY`         | 1 GB                                            |                                                        |
-| `CELEBORN_WORKER_OFFHEAP_MEMORY` | 1 GB                                            |                                                        |
-| `CELEBORN_MASTER_JAVA_OPTS`      |                                                 |                                                        |
-| `CELEBORN_WORKER_JAVA_OPTS`      |                                                 |                                                        |
-| `CELEBORN_PID_DIR`               | `${CELEBORN_HOME}/pids`                         |                                                        |
-| `CELEBORN_LOG_DIR`               | `${CELEBORN_HOME}/logs`                         |                                                        |
-| `CELEBORN_SSH_OPTS`              | `-o StrictHostKeyChecking=no`                   |                                                        |
-| `CELEBORN_SLEEP`                 |                                                 | Waiting time for `start-all` and `stop-all` operations |
-| `CELEBORN_PREFER_JEMALLOC`       |                                                 | set `true` to enable jemalloc memory allocator         |
-| `CELEBORN_JEMALLOC_PATH`         |                                                 | jemalloc library path                                  |
+| Key                              | Default                                         | Description                                              |
+|----------------------------------|-------------------------------------------------|----------------------------------------------------------|
+| `CELEBORN_HOME`                  | ``$(cd "`dirname "$0"`"/..; pwd)``              |                                                          |
+| `CELEBORN_CONF_DIR`              | `${CELEBORN_CONF_DIR:-"${CELEBORN_HOME}/conf"}` |                                                          |
+| `CELEBORN_MASTER_MEMORY`         | 1 GB                                            |                                                          |
+| `CELEBORN_WORKER_MEMORY`         | 1 GB                                            |                                                          |
+| `CELEBORN_WORKER_OFFHEAP_MEMORY` | 1 GB                                            |                                                          |
+| `CELEBORN_MASTER_JAVA_OPTS`      |                                                 |                                                          |
+| `CELEBORN_WORKER_JAVA_OPTS`      |                                                 |                                                          |
+| `CELEBORN_PID_DIR`               | `${CELEBORN_HOME}/pids`                         |                                                          |
+| `CELEBORN_LOG_DIR`               | `${CELEBORN_HOME}/logs`                         |                                                          |
+| `CELEBORN_SSH_OPTS`              | `-o StrictHostKeyChecking=no`                   | ssh opts for `start-all` and `stop-all` operations       |
+| `CELEBORN_SLEEP`                 |                                                 | Waiting time for `start-all` and `stop-all` operations   |
+| `CELEBORN_PREFER_JEMALLOC`       |                                                 | set `true` to enable jemalloc memory allocator           |
+| `CELEBORN_JEMALLOC_PATH`         |                                                 | jemalloc library path                                    |
+| `CELEBORN_NO_DAEMONIZE`          |                                                 | set `true` to run the proposed command in the foreground |
 
 ## Tuning