diff --git a/Dockerfile b/Dockerfile
index 52ac1f5fd..9c7c0e579 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,13 @@ VOLUME /app/var/
 
 # persistent / runtime deps
 # hadolint ignore=DL3008
-RUN apt-get update && apt-get install -y --no-install-recommends \
-	file \
-	git \
-	&& rm -rf /var/lib/apt/lists/*
-
 RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		file \
+		git \
+	; \
+	rm -rf /var/lib/apt/lists/*; \
 	install-php-extensions \
 		@composer \
 		apcu \
@@ -85,9 +86,9 @@ RUN set -eux; \
 
 # copy sources
 COPY --link . ./
-RUN rm -Rf frankenphp/
 
 RUN set -eux; \
+	rm -Rf frankenphp/; \
 	mkdir -p var/cache var/log; \
 	composer dump-autoload --classmap-authoritative --no-dev; \
 	composer dump-env prod; \