diff --git a/Dockerfile b/Dockerfile
index e01595c..caa695b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,14 +12,18 @@
 
 FROM debian:buster as builder
 
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get dist-upgrade -y -q --no-install-recommends
+
 # Apt-get our dependencies, download, build, and install VIPS, and download and install Go.
 ADD preinstall.sh /app/src/github.com/die-net/fotomat/
-RUN DEBIAN_FRONTEND=noninteractive \
-    VIPS_OPTIONS="--prefix=/usr" \
+RUN VIPS_OPTIONS="--prefix=/usr" \
     /app/src/github.com/die-net/fotomat/preinstall.sh
 
 # Install busybox.
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends busybox
+RUN apt-get install -y -q --no-install-recommends busybox
 
 # Add the rest of our code.
 ADD . /app/src/github.com/die-net/fotomat/
diff --git a/Dockerfile-dpkg b/Dockerfile-dpkg
index 655242f..44e9d31 100644
--- a/Dockerfile-dpkg
+++ b/Dockerfile-dpkg
@@ -7,16 +7,18 @@
 ARG BASE
 FROM $BASE
 
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get dist-upgrade -y -q --no-install-recommends && \
+    apt-get install -y -q --no-install-recommends fakeroot
+
 # Apt-get our dependencies, download, build, and install VIPS, and download and install Go.
 ADD preinstall.sh /app/src/github.com/die-net/fotomat/
-RUN DEBIAN_FRONTEND=noninteractive \
-    CFLAGS="-O2 -ftree-vectorize -msse2 -ffast-math -fPIE" \
+RUN CFLAGS="-O2 -ftree-vectorize -msse2 -ffast-math -fPIE" \
     VIPS_OPTIONS="--disable-shared --enable-static" \
     /app/src/github.com/die-net/fotomat/preinstall.sh
 
-# Add dpkg build tool.
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --no-install-recommends fakeroot
-
 # Add the rest of our code.
 ADD . /app/src/github.com/die-net/fotomat/
 
diff --git a/Dockerfile-rpm b/Dockerfile-rpm
index 11c6043..20e17fa 100644
--- a/Dockerfile-rpm
+++ b/Dockerfile-rpm
@@ -7,6 +7,10 @@
 ARG BASE
 FROM $BASE
 
+# Update packages and add a tool for building RPMs.
+RUN yum -y update && \
+    yum -y install rpm-build
+
 # Apt-get our dependencies, download, build, and install VIPS, and download and install Go.
 ADD preinstall.sh /app/src/github.com/die-net/fotomat/
 
@@ -15,9 +19,6 @@ RUN CFLAGS="-O2 -ftree-vectorize -msse2 -ffast-math -fPIE" \
     VIPS_OPTIONS="--disable-shared --enable-static" \
     /app/src/github.com/die-net/fotomat/preinstall.sh
 
-# Add a tool for building RPMs.
-RUN yum -y install rpm-build
-
 # Add the rest of our code.
 ADD . /app/src/github.com/die-net/fotomat/