diff --git a/Dockerfile b/Dockerfile
index e86f09e70..46a9e709e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,33 +53,28 @@ COPY --from=mariadb /usr/local/bin/docker-entrypoint.sh /usr/local/bin/db_entryp
 
 # Run base build process
 COPY ./util/docker/common /bd_build/
+
 RUN bash /bd_build/prepare.sh \
-    && bash /bd_build/add_user.sh \
-    && bash /bd_build/cleanup.sh \
-    && rm -rf /bd_build
+    && bash /bd_build/add_user.sh
 
 # Build each set of dependencies in their own step for cacheability.
 COPY ./util/docker/supervisor /bd_build/supervisor/
-RUN bash /bd_build/supervisor/setup.sh \
-    && rm -rf /bd_build/supervisor
+RUN bash /bd_build/supervisor/setup.sh
 
 COPY ./util/docker/stations /bd_build/stations/
-RUN bash /bd_build/stations/setup.sh \
-    && rm -rf /bd_build/stations
+RUN bash /bd_build/stations/setup.sh
 
 COPY ./util/docker/web /bd_build/web/
-RUN bash /bd_build/web/setup.sh \
-    && rm -rf /bd_build/web
+RUN bash /bd_build/web/setup.sh
 
 COPY ./util/docker/mariadb /bd_build/mariadb/
-RUN bash /bd_build/mariadb/setup.sh \
-    && rm -rf /bd_build/mariadb
+RUN bash /bd_build/mariadb/setup.sh
 
 COPY ./util/docker/redis /bd_build/redis/
-RUN bash /bd_build/redis/setup.sh \
-    && rm -rf /bd_build/redis
+RUN bash /bd_build/redis/setup.sh
 
-RUN rm -rf /bd_build
+RUN bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build
 
 VOLUME ["/var/azuracast/stations", "/var/azuracast/uploads", "/var/azuracast/backups", "/var/azuracast/sftpgo/persist", "/var/azuracast/servers/shoutcast2", "/var/azuracast/meilisearch/persist"]
 
diff --git a/util/docker/common/prepare.sh b/util/docker/common/prepare.sh
index eac75f1df..81261173c 100644
--- a/util/docker/common/prepare.sh
+++ b/util/docker/common/prepare.sh
@@ -7,6 +7,8 @@ set -x
 ## http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594189
 export INITRD=no
 
+export DEBIAN_FRONTEND=noninteractive
+
 ## Enable Ubuntu Universe, Multiverse, and deb-src for main.
 sed -i 's/^#\s*\(deb.*main restricted\)$/\1/g' /etc/apt/sources.list
 sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
@@ -58,7 +60,7 @@ update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8
 mkdir -p /etc/my_init.d
 
 # Install other common scripts.
-DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+apt-get install -y --no-install-recommends \
     tini gosu curl wget tar zip unzip git rsync tzdata gpg-agent openssh-client
 
 # Add scripts
diff --git a/util/docker/mariadb/setup.sh b/util/docker/mariadb/setup.sh
index b70a48c9b..4cc293413 100644
--- a/util/docker/mariadb/setup.sh
+++ b/util/docker/mariadb/setup.sh
@@ -2,6 +2,8 @@
 set -e
 set -x
 
+export DEBIAN_FRONTEND=noninteractive
+
 apt-get update
 
 # Install common scripts
diff --git a/util/docker/redis/setup.sh b/util/docker/redis/setup.sh
index f41ea111c..053d0a875 100644
--- a/util/docker/redis/setup.sh
+++ b/util/docker/redis/setup.sh
@@ -2,6 +2,8 @@
 set -e
 set -x
 
+export DEBIAN_FRONTEND=noninteractive
+
 apt-get update
 
 # Install common scripts
diff --git a/util/docker/stations/setup.sh b/util/docker/stations/setup.sh
index 291d98c83..f9bbfe9fc 100644
--- a/util/docker/stations/setup.sh
+++ b/util/docker/stations/setup.sh
@@ -2,6 +2,8 @@
 set -e
 set -x
 
+export DEBIAN_FRONTEND=noninteractive
+
 apt-get update
 
 # Install common scripts
diff --git a/util/docker/supervisor/setup.sh b/util/docker/supervisor/setup.sh
index 510ba2995..41cf26575 100644
--- a/util/docker/supervisor/setup.sh
+++ b/util/docker/supervisor/setup.sh
@@ -2,6 +2,8 @@
 set -e
 set -x
 
+export DEBIAN_FRONTEND=noninteractive
+
 apt-get update
 
 # Install common scripts
diff --git a/util/docker/web/setup.sh b/util/docker/web/setup.sh
index f065a2fe0..11e35500b 100644
--- a/util/docker/web/setup.sh
+++ b/util/docker/web/setup.sh
@@ -2,6 +2,8 @@
 set -e
 set -x
 
+export DEBIAN_FRONTEND=noninteractive
+
 apt-get update
 
 # Install common scripts