diff --git a/dnscrypt/proxy/Dockerfile b/dnscrypt/proxy/Dockerfile
index 2f0d495..692b936 100644
--- a/dnscrypt/proxy/Dockerfile
+++ b/dnscrypt/proxy/Dockerfile
@@ -12,7 +12,8 @@ ENV RESOLVER_ADDR 208.67.220.220:443
 ENV PROVIDER_NAME 2.dnscrypt-cert.opendns.com
 ENV PROVIDER_KEY B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79
 
-RUN apt-get update \
+RUN set -xe \
+    && apt-get update \
     && apt-get install -y build-essential curl \
     && mkdir libsodium \
         && cd libsodium \
diff --git a/dnscrypt/wrapper/Dockerfile b/dnscrypt/wrapper/Dockerfile
index 08f3c70..75e51b0 100644
--- a/dnscrypt/wrapper/Dockerfile
+++ b/dnscrypt/wrapper/Dockerfile
@@ -5,13 +5,14 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@datageek.info>
 
-ENV LIBSODIUM_VERSION 1.0.3
+ENV LIBSODIUM_VERSION 1.0.8
 ENV DNSCRYPT_VERSION 0.2
 ENV RESOLVER_ADDR 8.8.8.8:53
 ENV LISTEN_ADDR 0.0.0.0:443
 ENV PROVIDER_NAME 2.dnscrypt-cert.datageek.info
 
-RUN apt-get update \
+RUN set -xe \
+    && apt-get update \
     && apt-get install -y autoconf \
                           automake \
                           build-essential \
@@ -43,7 +44,8 @@ RUN apt-get update \
                                       libevent-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir -p /var/lib/dnscrypt-wrapper \
+RUN set -xe \
+    && mkdir -p /var/lib/dnscrypt-wrapper \
     && cd /var/lib/dnscrypt-wrapper \
     && dnscrypt-wrapper --gen-provider-keypair > README.txt \
     && dnscrypt-wrapper --gen-crypt-keypair --crypt-secretkey-file=1.key \