diff --git a/docker/README.md b/docker/README.md
index 51784bfb5c..65722f8e2d 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,10 +1,10 @@
-# Dockerized tiops
+# Dockerized tiup-cluster
 
-This docker image attempts to simplify the setup required by tiops.
-It is intended to be used by a CI tool or anyone with docker who wants to try tiops themselves.
+This docker image attempts to simplify the setup required by tiup-cluster.
+It is intended to be used by a CI tool or anyone with docker who wants to try tiup-cluster themselves.
 
-It contains all the tiops dependencies and code. It uses [Docker Compose](https://github.com/docker/compose) to spin up the five
-containers used by tiops.
+It contains all the tiup-cluster dependencies and code. It uses [Docker Compose](https://github.com/docker/compose) to spin up the five
+containers used by tiup-cluster.
 
 To start run
 
@@ -13,6 +13,6 @@ To start run
     docker exec -it tiup-cluster-control bash
 ```
 
-During development, it's convenient to run with `--dev` option, which mounts `$TIUP_CLUSTER_ROOT` dir as `/tiops` on tiops control container.
+During development, it's convenient to run with `--dev` option, which mounts `$TIUP_CLUSTER_ROOT` dir as `/tiup-cluster` on tiup-cluster control container.
 
 Run `./up.sh --help` for more info.
diff --git a/docker/control/Dockerfile b/docker/control/Dockerfile
index 682fa1492f..71210fc2eb 100644
--- a/docker/control/Dockerfile
+++ b/docker/control/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14
+FROM golang:1.16
 
 
 # Use mirrors for poor network...
diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile
index bb9b3883af..823772972c 100644
--- a/docker/node/Dockerfile
+++ b/docker/node/Dockerfile
@@ -1,5 +1,5 @@
 # Based on the deprecated `https://github.com/tutumcloud/tutum-debian`
-FROM golang:1.14
+FROM golang:1.16
 
 # Use mirrors for poor network...
 #RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list && \
diff --git a/tests/tiup-cluster/script/cmd_subtest.sh b/tests/tiup-cluster/script/cmd_subtest.sh
index e34c92e57f..d7767aab82 100755
--- a/tests/tiup-cluster/script/cmd_subtest.sh
+++ b/tests/tiup-cluster/script/cmd_subtest.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eu
+
 function cmd_subtest() {
     mkdir -p ~/.tiup/bin/
 
diff --git a/tests/tiup-cluster/script/scale_core.sh b/tests/tiup-cluster/script/scale_core.sh
index 05961f8615..553c35e2ed 100755
--- a/tests/tiup-cluster/script/scale_core.sh
+++ b/tests/tiup-cluster/script/scale_core.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eu
+
 function scale_core() {
     mkdir -p ~/.tiup/bin/
 
diff --git a/tests/tiup-cluster/script/scale_tools.sh b/tests/tiup-cluster/script/scale_tools.sh
index 5911e63c57..291097f86c 100755
--- a/tests/tiup-cluster/script/scale_tools.sh
+++ b/tests/tiup-cluster/script/scale_tools.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eu
+
 function scale_tools() {
     mkdir -p ~/.tiup/bin/