diff --git a/Dockerfile b/Dockerfile
index cac8c009d9..912575fe68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,13 @@
 # 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
+ARG COMPOSE_VERSION=v5.0.1
+FROM docker/compose-bin:${COMPOSE_VERSION} AS compose-bin
 
-FROM debian:trixie-20251208-slim AS compose-plugin
+
+# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base
+FROM octopusdeploy/dhi-debian-base:trixie-debian13 AS compose-plugin
 WORKDIR /home/compose
-RUN groupadd --gid 3000 compose \
-  && useradd --uid 3000 \
-    --gid 3000 \
-    --home /home/compose \
-    --shell /bin/bash \
-    compose  
-COPY --from=compose --chown=compose:compose /docker-compose /usr/local/bin/docker-compose
+COPY --chown=nonroot:nonroot --chmod=755 --from=compose-bin /docker-compose /usr/local/bin/docker-compose
 
 ENV COMPOSE_COMPATIBILITY=true
-USER compose:compose
+USER nonroot:nonroot
 ENTRYPOINT [ "docker-compose" ]
diff --git a/service.yaml b/service.yaml
index 3edec6d35f..a8ed905a5f 100644
--- a/service.yaml
+++ b/service.yaml
@@ -1 +1 @@
-version: 1.5.8
+version: 1.6.0