diff --git a/arch-ansible-latest/Dockerfile b/arch-ansible-latest/Dockerfile
index 9337450..09c8370 100644
--- a/arch-ansible-latest/Dockerfile
+++ b/arch-ansible-latest/Dockerfile
@@ -26,7 +26,7 @@ RUN pacman -S -y \
     glibc \
     python \
     ansible \
-  && yes | pacman -Scc || true
+  && pacman -Scc --noconfirm || true
 
 # Install Ansible inventory file.
 RUN mkdir /etc/ansible \
diff --git a/openwrt-ansible-latest/Dockerfile b/openwrt-ansible-latest/Dockerfile
index 84d19b8..5b3e128 100644
--- a/openwrt-ansible-latest/Dockerfile
+++ b/openwrt-ansible-latest/Dockerfile
@@ -3,6 +3,7 @@ LABEL maintainer="Sebastian Gumprich"
 
 RUN mkdir -p /var/lock && \
     opkg update && \
+    set -o pipefail && \
     if [[ $(opkg list-upgradable) ]]; then opkg list-upgradable | cut -f 1 -d ' ' | xargs opkg upgrade; fi && \
     opkg install python3 python3-pip python3-cryptography \
     sudo bash sed shadow-su shadow-groupadd shadow-useradd shadow-usermod