diff --git a/app/data/container-build/cerc-datanet-eth-geth/build.sh b/app/data/container-build/cerc-datanet-eth-geth/build.sh
index ced6f0bb..b36c54be 100755
--- a/app/data/container-build/cerc-datanet-eth-geth/build.sh
+++ b/app/data/container-build/cerc-datanet-eth-geth/build.sh
@@ -2,8 +2,7 @@
 #
 #Build cerc/datanet-eth-geth
 
-set +e
-set+x
+set -e
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
@@ -13,3 +12,5 @@ cp -rp $SCRIPT_DIR/../cerc-fixturenet-eth-geth $SCRIPT_DIR/build
 cp -f $SCRIPT_DIR/el-config.yaml $SCRIPT_DIR/build/genesis/el/el-config.yaml
 
 docker build -t cerc/datanet-eth-geth:local ${SCRIPT_DIR}/build
+
+rm -rf $SCRIPT_DIR/build