diff --git a/Dockerfile b/Dockerfile
index f0704a3c01..cac8c009d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,7 @@
+# CI relies on this ARG. Don't remove or rename it
+ARG COMPOSE_VERSION=v2.40.3
+FROM docker/compose-bin:${COMPOSE_VERSION} AS compose
+
 FROM debian:trixie-20251208-slim AS compose-plugin
 WORKDIR /home/compose
 RUN groupadd --gid 3000 compose \
@@ -6,7 +10,7 @@ RUN groupadd --gid 3000 compose \
     --home /home/compose \
     --shell /bin/bash \
     compose  
-COPY --from=docker/compose-bin:v2.40.3 --chown=compose:compose /docker-compose /usr/local/bin/docker-compose
+COPY --from=compose --chown=compose:compose /docker-compose /usr/local/bin/docker-compose
 
 ENV COMPOSE_COMPATIBILITY=true
 USER compose:compose
diff --git a/service.yaml b/service.yaml
index d63350cf71..3edec6d35f 100644
--- a/service.yaml
+++ b/service.yaml
@@ -1 +1 @@
-version: 1.5.7
+version: 1.5.8