diff --git a/charts/apiserver/templates/bin/_pre_stop.tpl b/charts/apiserver/templates/bin/_pre_stop.tpl
index e58fffe9..5e6342b5 100644
--- a/charts/apiserver/templates/bin/_pre_stop.tpl
+++ b/charts/apiserver/templates/bin/_pre_stop.tpl
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -ex
 
 touch /tmp/stop
 sleep {{ .Values.anchor.period }}
diff --git a/charts/controller_manager/templates/bin/_pre_stop.tpl b/charts/controller_manager/templates/bin/_pre_stop.tpl
index e58fffe9..5e6342b5 100644
--- a/charts/controller_manager/templates/bin/_pre_stop.tpl
+++ b/charts/controller_manager/templates/bin/_pre_stop.tpl
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -ex
 
 touch /tmp/stop
 sleep {{ .Values.anchor.period }}
diff --git a/charts/etcd/templates/bin/_pre_stop.tpl b/charts/etcd/templates/bin/_pre_stop.tpl
index 5346a63f..f455b32d 100644
--- a/charts/etcd/templates/bin/_pre_stop.tpl
+++ b/charts/etcd/templates/bin/_pre_stop.tpl
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -ex
 
 function cleanup_host {
     rm -f $MANIFEST_PATH
diff --git a/charts/haproxy/templates/bin/_pre_stop.tpl b/charts/haproxy/templates/bin/_pre_stop.tpl
index 3d5d5275..5e6e1fb5 100644
--- a/charts/haproxy/templates/bin/_pre_stop.tpl
+++ b/charts/haproxy/templates/bin/_pre_stop.tpl
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-set -x
+set -ex
 
 touch /tmp/stop
 sleep {{ .Values.conf.anchor.period }}
diff --git a/charts/scheduler/templates/bin/_pre_stop.tpl b/charts/scheduler/templates/bin/_pre_stop.tpl
index 769c1b9d..a559b01c 100644
--- a/charts/scheduler/templates/bin/_pre_stop.tpl
+++ b/charts/scheduler/templates/bin/_pre_stop.tpl
@@ -15,7 +15,7 @@
 # limitations under the License.
 */}}
 
-set -x
+set -ex
 
 touch /tmp/stop
 sleep {{ .Values.anchor.period }}