diff --git a/Containerfile b/Containerfile
index 984a7f9..588b154 100644
--- a/Containerfile
+++ b/Containerfile
@@ -28,9 +28,7 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
   --mount=type=cache,dst=/var/cache \
   --mount=type=cache,dst=/var/log \
   --mount=type=tmpfs,dst=/tmp \
-  /ctx/build.sh
-
-RUN /ctx/cleanup.sh
+  /ctx/build.sh && /ctx/cleanup.sh
 
 ### LINTING
 ## Verify final image and contents are correct.
diff --git a/build_files/cleanup.sh b/build_files/cleanup.sh
index f38b0fc..25b0bc3 100755
--- a/build_files/cleanup.sh
+++ b/build_files/cleanup.sh
@@ -2,6 +2,17 @@
 
 set -ouex pipefail
 
+echo "Let's see."
+echo "/etc/passwd contents:"
+cat /etc/passwd
+echo "/usr/lib/passwd contents:"
+cat /usr/lib/passwd
+echo ""
+echo "/etc/group contents:"
+cat /etc/group
+echo "/usr/lib/group contents:"
+cat /usr/lib/group
+
 ## Handle files that rpm-ostree would normally remove
 ## Borrowed from: https://github.com/hhd-dev/rechunk/blob/master/1_prune.sh#L33
 if [ -f /etc/passwd ]; then