diff --git a/atom/Dockerfile b/atom/Dockerfile
index 37764111e..117d0b624 100644
--- a/atom/Dockerfile
+++ b/atom/Dockerfile
@@ -55,8 +55,9 @@ RUN apt-get update && apt-get install -y \
 	libxtst6 \
 	libx11-xcb-dev \
 	xdg-utils \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Autorun atom
 ENTRYPOINT [ "atom", "--foreground" ]
diff --git a/cura/Dockerfile b/cura/Dockerfile
index f4e1504cf..b77478e7c 100644
--- a/cura/Dockerfile
+++ b/cura/Dockerfile
@@ -5,14 +5,12 @@ RUN apt-get update && apt-get install -y \
 	libgfortran4 \
 	libssl-dev \
 	wget \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends
 
 RUN wget https://gitlab.com/lulzbot3d/cura-le/cura-lulzbot/uploads/0676b39295476b93181fa8a512f34265/cura-lulzbot_3.2.21_amd64.deb -O /tmp/cura.deb \
-	&& apt update \
 	&& dpkg -i /tmp/cura.deb || true \
 	&& apt-get -yf install \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& rm -rf /tmp/cura.deb
+	&& apt-get clean \
+    	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 CMD ["cura-lulzbot"]
diff --git a/gimp/Dockerfile b/gimp/Dockerfile
index b2dc6d593..1c4ec974f 100644
--- a/gimp/Dockerfile
+++ b/gimp/Dockerfile
@@ -13,7 +13,8 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN apt-get update && apt-get install -y \
 	gimp \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENTRYPOINT [ "gimp" ]
diff --git a/lynx/Dockerfile b/lynx/Dockerfile
index 8fdd0c3be..c0f1da54a 100644
--- a/lynx/Dockerfile
+++ b/lynx/Dockerfile
@@ -9,7 +9,8 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN apt-get update && apt-get install -y \
 	lynx \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENTRYPOINT [ "lynx" ]
diff --git a/nmap/Dockerfile b/nmap/Dockerfile
index 8ec0f1035..f50129107 100644
--- a/nmap/Dockerfile
+++ b/nmap/Dockerfile
@@ -3,7 +3,8 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN apt-get update && apt-get install -y \
 	nmap \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENTRYPOINT [ "nmap" ]
diff --git a/nomad/Dockerfile b/nomad/Dockerfile
index 781ddb8cc..ac877ed41 100644
--- a/nomad/Dockerfile
+++ b/nomad/Dockerfile
@@ -8,14 +8,13 @@ RUN apt-get update && apt-get install -y \
 	apt-transport-https \
 	ca-certificates \
 	curl \
-    --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/* \
+	--no-install-recommends \
 	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
 	&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get install -y \
 	gcc \
 	git \
 	g++ \
@@ -26,8 +25,9 @@ RUN apt-get update && apt-get install -y \
 	python \
 	yarn \
 	zip \
-    --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENV NOMAD_VERSION v0.10.2
 
diff --git a/s3cmd/Dockerfile b/s3cmd/Dockerfile
index c9cb35632..fc574b68e 100644
--- a/s3cmd/Dockerfile
+++ b/s3cmd/Dockerfile
@@ -13,8 +13,9 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 RUN apt-get update && apt-get install -y \
 	ca-certificates \
 	s3cmd \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Setup s3cmd config
 RUN { \
diff --git a/skype/Dockerfile b/skype/Dockerfile
index e5b74b35c..bb1d0ec14 100644
--- a/skype/Dockerfile
+++ b/skype/Dockerfile
@@ -29,8 +29,9 @@ RUN echo "deb [arch=amd64] https://repo.skype.com/deb stable main" > /etc/apt/so
 
 RUN apt-get update && apt-get -y install \
 	skypeforlinux \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 COPY run-skype-and-wait-for-exit /usr/local/bin
 
diff --git a/slack/Dockerfile b/slack/Dockerfile
index cfdd8523b..82a6027f3 100644
--- a/slack/Dockerfile
+++ b/slack/Dockerfile
@@ -26,8 +26,7 @@ RUN apt-get update && apt-get install -y \
 	curl \
 	gnupg \
 	locales \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends
 
 RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
 	&& locale-gen en_US.utf8 \
@@ -37,13 +36,14 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
 RUN curl -sSL https://packagecloud.io/slacktechnologies/slack/gpgkey | apt-key add -
 RUN echo "deb https://packagecloud.io/slacktechnologies/slack/debian/ jessie main" > /etc/apt/sources.list.d/slacktechnologies_slack.list
 
-RUN apt-get update && apt-get -y install \
+RUN apt-get -y install \
 	libasound2 \
 	libgtk-3-0 \
 	libx11-xcb1 \
 	libxkbfile1 \
 	slack-desktop \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENTRYPOINT ["/usr/lib/slack/slack"]
diff --git a/slapd/Dockerfile b/slapd/Dockerfile
index f1a72c6ac..fb81e7930 100644
--- a/slapd/Dockerfile
+++ b/slapd/Dockerfile
@@ -31,8 +31,9 @@ RUN apt-get update && LC_ALL=C DEBIAN_FRONTEND=noninteractive \
 	apt-get install -y \
 	ldap-utils \
 	slapd \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
+	--no-install-recommends && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Just some default values for fun!
 ENV LDAP_ROOTPASS=fsociety LDAP_ORGANIZATION="E CORP" LDAP_DOMAIN=mr.robot.com