diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f392870..4043d7a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,7 +21,7 @@ jobs:
   - script: sudo docker pull hadolint/hadolint:$(versionHadolint)
     displayName: 'Install Hadolint'
   - script: |
-      #set -e
+      set -e
       shopt -s globstar
       for dockerfile in **/Dockerfile
       do
diff --git a/google_assistant/Dockerfile b/google_assistant/Dockerfile
index 5005fbe..238effe 100644
--- a/google_assistant/Dockerfile
+++ b/google_assistant/Dockerfile
@@ -5,7 +5,9 @@ FROM $BUILD_FROM
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         jq tzdata python3 python3-dev python3-pip libportaudio2 alsa-utils \
-    && pip3 install --no-cache-dir --upgrade setuptools \
+    && pip3 install --no-cache-dir --upgrade \
+        setuptools==41.0.1 \
+        pip==19.1 \
     && pip3 install --no-cache-dir \
         google-assistant-library==1.0.0 \
         google-assistant-sdk==0.5.0 \
diff --git a/homematic/Dockerfile b/homematic/Dockerfile
index 777e69b..dc46aa6 100644
--- a/homematic/Dockerfile
+++ b/homematic/Dockerfile
@@ -1,9 +1,12 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
+# Set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 # Install packages
 RUN apt-get update \
-    && apt-get install -y \
+    && apt-get install -y --no-install-recommends \
         curl \
         libusb-1.0 \
         openjdk-11-jre-headless \
diff --git a/snips/Dockerfile b/snips/Dockerfile
index 9498e0b..cf50f3f 100644
--- a/snips/Dockerfile
+++ b/snips/Dockerfile
@@ -10,7 +10,13 @@ COPY snips-entrypoint.sh /
 ARG BUILD_ARCH
 
 RUN apt-get update \
-    && apt-get install -y dirmngr apt-utils apt-transport-https jq unzip supervisor mpg123 curl tzdata \
+    && apt-get install -y --no-install-recommends \
+        dirmngr \
+        apt-utils \
+        apt-transport-https \
+        unzip \
+        supervisor \
+        mpg123 \
     && rm -rf /var/lib/apt/lists/* \
     && if [ "$BUILD_ARCH" = "amd64" ]; \
         then \
@@ -22,7 +28,11 @@ RUN apt-get update \
         fi
 
 RUN apt-get update \
-    && apt-get install -y snips-platform-voice snips-asr snips-injection snips-watch \
+    && apt-get install -y --no-install-recommends \
+        snips-platform-voice \
+        snips-asr \
+        snips-injection \
+        snips-watch \
     && rm -rf /var/lib/apt/lists/* \
     && curl -L -o /assistant_Hass_de.zip https://s3.amazonaws.com/hassio-addons-data/assistant_Hass_de.zip \
     && curl -L -o /assistant_Hass_en.zip https://s3.amazonaws.com/hassio-addons-data/assistant_Hass_en.zip \