diff --git a/Dockerfile b/Dockerfile
index 8245eff..a21ff74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -166,13 +166,13 @@ FROM $BASEIMAGE AS final
 
 LABEL maintainer="team@appwrite.io"
 
-ENV DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
-ENV DOCKER_COMPOSE_VERSION="v2.33.1"
-
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+RUN set -ex
+
 RUN \
   apk update \
+  && apk upgrade \
   && apk add --no-cache --virtual .deps \
   linux-headers \
   make \
@@ -201,6 +201,7 @@ RUN \
   libmaxminddb-dev \
   certbot \
   docker-cli \
+  docker-cli-compose \
   libgomp \
   git \
   zip \
@@ -209,11 +210,6 @@ RUN \
   && apk del .deps \
   && rm -rf /var/cache/apk/*
 
-RUN mkdir -p $DOCKER_CONFIG/cli-plugins \
-  && ARCH=$(uname -m) && if [ $ARCH == "armv7l" ]; then ARCH="armv7"; fi \
-  && curl -SL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-linux-$ARCH -o $DOCKER_CONFIG/cli-plugins/docker-compose \
-  && chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
-
 WORKDIR /usr/src/code
 
 COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20240924/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20240924/
diff --git a/tests.yaml b/tests.yaml
index b68e42d..276f1f6 100644
--- a/tests.yaml
+++ b/tests.yaml
@@ -17,6 +17,10 @@ commandTests:
     command: "docker"
     args: ["--version"]
     expectedOutput: ["Docker version 28.*"]
+  - name: 'Docker Compose command'
+    command: "docker"
+    args: ["compose", "version"]
+    expectedOutput: ["Docker Compose version v.*"]
   - name: 'PHP modules'
     command: "php"
     args: ["-m"]