diff --git a/Dockerfile b/Dockerfile
index 6073f5297..d9cb117a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,25 +40,36 @@ RUN bash /bd_build/prepare.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
+RUN bash /bd_build/supervisor/setup.sh \
+    && bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build/supervisor
 
 COPY ./util/docker/stations /bd_build/stations/
-RUN bash /bd_build/stations/setup.sh
+RUN bash /bd_build/stations/setup.sh \
+    && bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build/stations
 
 COPY ./util/docker/web /bd_build/web/
-RUN bash /bd_build/web/setup.sh
+RUN bash /bd_build/web/setup.sh \
+    && bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build/web
 
 COPY ./util/docker/mariadb /bd_build/mariadb/
-RUN bash /bd_build/mariadb/setup.sh
+RUN bash /bd_build/mariadb/setup.sh \
+    && bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build/mariadb
 
 COPY ./util/docker/redis /bd_build/redis/
-RUN bash /bd_build/redis/setup.sh
+RUN bash /bd_build/redis/setup.sh \
+    && bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build/redis
 
 COPY ./util/docker/docs /bd_build/docs/
-RUN bash /bd_build/docs/setup.sh
+RUN bash /bd_build/docs/setup.sh \
+    && bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build/docs
 
 RUN bash /bd_build/chown_dirs.sh \
-    && bash /bd_build/cleanup.sh \
     && rm -rf /bd_build
 
 USER azuracast