diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile
index 5789a4cd818..6c7bbc161da 100644
--- a/docker/builder/Dockerfile
+++ b/docker/builder/Dockerfile
@@ -1,24 +1,24 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 
 RUN apt update -y && \
     apt install -y cmake libssl-dev libcrypto++-dev \
         libglib2.0-dev libltdl-dev libicu-dev libmysql++-dev \
         libreadline-dev libmysqlclient-dev unixodbc-dev \
+        unixodbc-dev devscripts dupload fakeroot debhelper \
         gcc-7 g++-7 unixodbc-dev devscripts dupload fakeroot debhelper \
         liblld-5.0-dev libclang-5.0-dev liblld-5.0
         # For tests: # bash expect python python-lxml python-termcolor curl perl sudo tzdata
 
 RUN apt install -y build-essential autoconf libtool pkg-config
 RUN apt install -y libgflags-dev libgtest-dev
-RUN apt install -y clang-5.0 libc++-dev
 RUN apt install -y golang
 
 RUN git clone https://github.com/curl/curl.git
 RUN cd /curl && mkdir .build && cd .build && cmake .. && make && make install
 
 RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.14.2 && git submodule update --init
-RUN cd /grpc && mkdir .build && cd .build && CC=/usr/lib/llvm-5.0/bin/clang CXX=/usr/lib/llvm-5.0/bin/clang++ cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)
-RUN cd /grpc && rm -rf .build && mkdir .build && cd .build && CC=/usr/lib/llvm-5.0/bin/clang CXX=/usr/lib/llvm-5.0/bin/clang++ && cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)
+RUN cd /grpc && mkdir .build && cd .build && cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)
+RUN cd /grpc && rm -rf .build && mkdir .build && cd .build && cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)
 
 ADD build.sh /
 RUN chmod +x /build.sh
diff --git a/docker/builder/Dockerfile-tics b/docker/builder/Dockerfile-tics
index 93163d9205c..5f035713220 100644
--- a/docker/builder/Dockerfile-tics
+++ b/docker/builder/Dockerfile-tics
@@ -1,4 +1,4 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 
 RUN apt update && \
     apt install -y tzdata python
diff --git a/docker/builder/build.sh b/docker/builder/build.sh
index f72bf201a35..6a3640ce325 100644
--- a/docker/builder/build.sh
+++ b/docker/builder/build.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+set -xe
+
 mkdir -p /server/build_docker
 cd /server/contrib/kvproto
 ./generate_cpp.sh
 cd /server/build_docker
-CC=/usr/lib/llvm-5.0/bin/clang CXX=/usr/lib/llvm-5.0/bin/clang++ LLVM_ROOT=/usr/lib/llvm-5.0 cmake /server -DENABLE_EMBEDDED_COMPILER=1 -DENABLE_TESTS=0
+cmake /server -DENABLE_EMBEDDED_COMPILER=1 -DENABLE_TESTS=0
 make -j $(nproc || grep -c ^processor /proc/cpuinfo) theflash
 #ctest -V -j $(nproc || grep -c ^processor /proc/cpuinfo)
 
diff --git a/tests/docker/run.sh b/tests/docker/run.sh
index f8592dd0ec8..1fa3c5c8e93 100755
--- a/tests/docker/run.sh
+++ b/tests/docker/run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -xe
+
 docker-compose down
 
 rm -rf ./data ./log
diff --git a/tests/run-test.sh b/tests/run-test.sh
index ce12be0e904..425d345f5de 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -97,6 +97,8 @@ function run_path()
 	fi
 }
 
+set -xe
+
 target="$1"
 fuzz="$2"
 skip_raw_test="$3"