diff --git a/.travis.yml b/.travis.yml
index 933a2099..a2edeb98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ compiler:
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mkdir -p /etc/docker && echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json && sudo service docker restart; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install qt5 && brew cask install xquartz && brew upgrade boost && brew install rust; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then travis_wait 40 ci/build-docker-image.sh docker/ci/Dockerfile nanocurrency/nano-ci; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ci/build-docker-image.sh docker/ci/Dockerfile nanocurrency/nano-ci; fi
 
 script:
   - if [ -n "$ONE_TIME_TESTS" ]; then ci/check-commit-format.sh; fi
@@ -42,9 +42,5 @@ script:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ci/build-travis.sh "/usr/local/opt/qt5/lib/cmake/Qt5"; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then docker run -v $TRAVIS_BUILD_DIR:/workspace nanocurrency/nano-ci /bin/bash -c "cd /workspace && ASAN=${ASAN} TSAN=${TSAN} ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"; fi
 
-deploy:
-  skip_cleanup: true
-  provider: script
-  script: travis_wait 80 ci/deploy-docker.sh
-  on:
-    condition: -n "$ONE_TIME_TESTS"
+after_script:
+  - if [ -n "$ONE_TIME_TESTS" ] && [ -n "$DOCKER_PASSWORD" ] && [ "$TRAVIS_BRANCH" = "master" ]; then ci/deploy-docker.sh; fi
diff --git a/ci/build-docker-image.sh b/ci/build-docker-image.sh
index 362e2536..ccd6ba20 100755
--- a/ci/build-docker-image.sh
+++ b/ci/build-docker-image.sh
@@ -3,5 +3,4 @@ set -eu
 
 docker pull "$2" || true
 echo "Building $2"
-# Output for the build is WAY too long for Travis logs
-docker build -f "$1" -t "$2" --cache-from "$2" . > /dev/null 2>&1
+docker build -f "$1" -t "$2" --cache-from "$2" .
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
index 9eb59e85..4bd6065a 100644
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -1,9 +1,9 @@
 FROM ubuntu:16.04
 
 ENV BOOST_BASENAME=boost_1_66_0 \
-    BOOST_URL=http://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
+    BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
 
-RUN apt-get update && apt-get install -yq \
+RUN apt-get update -qq && apt-get install -yqq \
     build-essential \
     cmake \
     g++ \
@@ -11,11 +11,11 @@ RUN apt-get update && apt-get install -yq \
 
 WORKDIR "/tmp"
 
-RUN wget -O ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
-    tar xzvf ${BOOST_BASENAME}.tar.gz && \
+RUN wget -qO ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
+    tar xzf ${BOOST_BASENAME}.tar.gz && \
     cd ${BOOST_BASENAME} && \
     ./bootstrap.sh && \
-    ./b2 link=static install && \
+    ./b2 -d0 link=static install && \
     rm -rf ${BOOST_BASENAME} && \
     rm -f ${BOOST_BASENAME}.tar.gz && \
     cd ..
diff --git a/docker/node/Dockerfile b/docker/node/Dockerfile
index 0f589da1..ff7467f4 100644
--- a/docker/node/Dockerfile
+++ b/docker/node/Dockerfile
@@ -4,16 +4,16 @@ ENV BOOST_BASENAME=boost_1_66_0 \
     BOOST_ROOT=/tmp/boost_install  \
     BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
 
-RUN apt-get update && apt-get install -yq \
+RUN apt-get update -qq && apt-get install -yqq \
     build-essential \
     cmake \
     g++ \
     wget && \
-    wget -O ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
-    tar xzvf ${BOOST_BASENAME}.tar.gz && \
+    wget -qO ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
+    tar xzf ${BOOST_BASENAME}.tar.gz && \
     cd ${BOOST_BASENAME} && \
     ./bootstrap.sh && \
-    ./b2 --prefix=${BOOST_ROOT} link=static install && \
+    ./b2 -d0 --prefix=${BOOST_ROOT} link=static install && \
     rm -rf ${BOOST_BASENAME} && \
     rm -f ${BOOST_BASENAME}.tar.gz && \
     cd .. && \