diff --git a/containers/agent/Containerfile b/containers/agent/Containerfile
index b13906f..914dffc 100644
--- a/containers/agent/Containerfile
+++ b/containers/agent/Containerfile
@@ -5,6 +5,9 @@
 ARG BASE_IMAGE="scratch"
 FROM $BASE_IMAGE
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/base/Containerfile b/containers/base/Containerfile
index 10f08b9..1df7208 100644
--- a/containers/base/Containerfile
+++ b/containers/base/Containerfile
@@ -4,6 +4,9 @@
 
 FROM ubuntu:22.04
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/cpp/Containerfile b/containers/cpp/Containerfile
index af422f1..ca8721b 100644
--- a/containers/cpp/Containerfile
+++ b/containers/cpp/Containerfile
@@ -5,6 +5,9 @@
 ARG BASE_IMAGE="scratch"
 FROM $BASE_IMAGE
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
@@ -103,7 +106,7 @@ RUN IWYU_TMP=$(mktemp -d) \
     && cmake --build build \
     && cmake --build build --target install \
     && cp -t /usr/local/bin iwyu_tool.py fix_includes.py \
-    && cd $WORKDIR \
+    && cd .. \
     && rm -rf $IWYU_TMP
 
 # Fix the IWYU resource directory, which is a required part of installation.
diff --git a/containers/emacs/Containerfile b/containers/emacs/Containerfile
index 1bb16ba..6350d34 100644
--- a/containers/emacs/Containerfile
+++ b/containers/emacs/Containerfile
@@ -9,6 +9,9 @@ FROM $EMACS_BUILDER_IMAGE AS emacs-builder
 FROM $DOOM_CACHE_IMAGE AS doom-cache
 FROM $BASE_IMAGE
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/emacs/doom_cache/Containerfile b/containers/emacs/doom_cache/Containerfile
index b2e7644..7ecade0 100644
--- a/containers/emacs/doom_cache/Containerfile
+++ b/containers/emacs/doom_cache/Containerfile
@@ -6,6 +6,9 @@ ARG EMACS_BUILDER_IMAGE="scratch"
 FROM $EMACS_BUILDER_IMAGE AS emacs-builder
 FROM ubuntu:22.04
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/emacs/emacs_builder/Containerfile b/containers/emacs/emacs_builder/Containerfile
index 8b0f4f4..0ecc7ef 100644
--- a/containers/emacs/emacs_builder/Containerfile
+++ b/containers/emacs/emacs_builder/Containerfile
@@ -4,6 +4,9 @@
 
 FROM ubuntu:22.04
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/python/Containerfile b/containers/python/Containerfile
index 7ff11f3..5232004 100644
--- a/containers/python/Containerfile
+++ b/containers/python/Containerfile
@@ -5,6 +5,9 @@
 ARG BASE_IMAGE="scratch"
 FROM $BASE_IMAGE
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/ros/Containerfile b/containers/ros/Containerfile
index b4cdd8f..35ffb0b 100644
--- a/containers/ros/Containerfile
+++ b/containers/ros/Containerfile
@@ -5,6 +5,9 @@
 ARG BASE_IMAGE="scratch"
 FROM $BASE_IMAGE
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/user/Containerfile b/containers/user/Containerfile
index 6e0eb69..ec2f92d 100644
--- a/containers/user/Containerfile
+++ b/containers/user/Containerfile
@@ -5,6 +5,9 @@
 ARG BASE_IMAGE="scratch"
 FROM $BASE_IMAGE
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /
diff --git a/containers/xpra/Containerfile b/containers/xpra/Containerfile
index 08b5d98..a7655d0 100644
--- a/containers/xpra/Containerfile
+++ b/containers/xpra/Containerfile
@@ -5,6 +5,9 @@
 ARG BASE_IMAGE="scratch"
 FROM $BASE_IMAGE
 
+# Set shell to Bash with better error flags
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # Ensure root user
 USER root
 WORKDIR /