diff --git a/Dockerfile b/Dockerfile
index 460a738f1c6..16f86945abb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 #
 # To update, run python3 -m script.hassfest -p docker
 ARG BUILD_FROM
-FROM ${BUILD_FROM}
+FROM ${BUILD_FROM} as deps
 
 LABEL \
     io.hass.type="core" \
@@ -50,6 +50,8 @@ RUN \
         --no-build \
         -r homeassistant/requirements_all.txt
 
+FROM deps
+
 ## Setup Home Assistant Core
 COPY . homeassistant/
 RUN \
diff --git a/script/hassfest/docker.py b/script/hassfest/docker.py
index 61fd416ee13..978e0781c19 100644
--- a/script/hassfest/docker.py
+++ b/script/hassfest/docker.py
@@ -17,7 +17,7 @@ DOCKERFILE_TEMPLATE = r"""# Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
 ARG BUILD_FROM
-FROM ${{BUILD_FROM}}
+FROM ${{BUILD_FROM}} as deps
 
 LABEL \
     io.hass.type="core" \
@@ -65,6 +65,8 @@ RUN \
         --no-build \
         -r homeassistant/requirements_all.txt
 
+FROM deps
+
 ## Setup Home Assistant Core
 COPY . homeassistant/
 RUN \