diff --git a/Dockerfile b/Dockerfile
index b0ca6b7f..0f92e17e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,14 +9,12 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG TARGETVARIANT
 
-# CI system should set this to a hash or git revision of the build directory and it's contents to
-# ensure consistent cache updates.
-ARG BUILD_FILES_REV=1
+ARG FORCE_INSTALL_PACKAGES=1
 RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} TARGET=${TARGETARCH}${TARGETVARIANT} /build/run.sh install-packages
+    TARGET=${TARGETARCH}${TARGETVARIANT} /build/run.sh install-packages
 
 RUN --mount=target=/build,source=build \
-    REV=${BUILD_FILES_REV} /build/run.sh setup-user
+    /build/run.sh setup-user
 
 COPY --chmod=644 files/sudoers* /etc/sudoers.d
 
diff --git a/build/alpine/install-packages.sh b/build/alpine/install-packages.sh
index 24bba090..ebafe041 100755
--- a/build/alpine/install-packages.sh
+++ b/build/alpine/install-packages.sh
@@ -16,7 +16,6 @@ apk add --no-cache -U \
     bash \
     curl iputils \
     git \
-    git-lfs \
     jq \
     mysql-client \
     tzdata \
diff --git a/build/ol/install-packages.sh b/build/ol/install-packages.sh
index f216662e..b8b27f67 100755
--- a/build/ol/install-packages.sh
+++ b/build/ol/install-packages.sh
@@ -25,7 +25,6 @@ dnf install -y ImageMagick \
   iputils \
   curl \
   git \
-  git-lfs \
   jq \
   dos2unix \
   mysql \
diff --git a/build/ubuntu/install-packages.sh b/build/ubuntu/install-packages.sh
index 134ad025..aea8111f 100755
--- a/build/ubuntu/install-packages.sh
+++ b/build/ubuntu/install-packages.sh
@@ -16,7 +16,6 @@ apt-get install -y \
   iputils-ping \
   curl \
   git \
-  git-lfs \
   jq \
   dos2unix \
   mysql-client \