diff --git a/Dockerfile b/Dockerfile
index f8ec40b..b308548 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM docker:20.10.6
-
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
+FROM docker:26.1.0
 
 RUN apk update \
   && apk add --no-cache \
+    aws-cli \
     bash \
     curl \
+    docker-compose \
     gcc \
     git \
     jq \
@@ -16,15 +16,11 @@ RUN apk update \
     make \
     openssh \
     openssl-dev \
-    py3-pip \
-    python3-dev \
     groff
 
-RUN pip3 install awscli docker-compose
-
 ARG ECS_HELPER_VERSION
 
 RUN gem install ecs_helper $ECS_HELPER_VERSION
 
 RUN mkdir /app
-WORKDIR /app
\ No newline at end of file
+WORKDIR /app
diff --git a/Makefile b/Makefile
index 4170de0..08f4a19 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,12 @@ check_version:
 	$(call check_variable,VERSION)
 
 build:
-	docker build --build-arg ECS_HELPER_VERSION="-v ${VERSION}" . -t ${VERSION_TAG} -t ${LATEST_TAG}
+	docker build --platform linux/amd64 --build-arg ECS_HELPER_VERSION="-v ${VERSION}" . -t ${VERSION_TAG} -t ${LATEST_TAG}
 
 push:
 	docker push ${VERSION_TAG}
+	docker push ${LATEST_TAG}
 
 release: check_version build push
 
-.SILENT: check_version
\ No newline at end of file
+.SILENT: check_version
diff --git a/docker-compose.yml b/docker-compose.yml
index e46bfc2..6e90559 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     build:
       context: .
       args:
-        - ECS_HELPER_VERSION=-v 0.0.24
+        - ECS_HELPER_VERSION=-v 0.0.37
     environment: *toolbox-environment
     volumes:
       - .:/app:cached