diff --git a/bitnami/aws-cli/1/debian-10/Dockerfile b/bitnami/aws-cli/1/debian-10/Dockerfile
index a4e9259135d1..f7de778ef10b 100644
--- a/bitnami/aws-cli/1/debian-10/Dockerfile
+++ b/bitnami/aws-cli/1/debian-10/Dockerfile
@@ -7,15 +7,15 @@ RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stac
     echo "7383dd22014a813976f81e7f7187ad07e8d0798594d9a52ea45d10f5648423ce  /tmp/bitnami/pkg/cache/python-3.7.7-3-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
     tar -zxf /tmp/bitnami/pkg/cache/python-3.7.7-3-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
     rm -rf /tmp/bitnami/pkg/cache/python-3.7.7-3-linux-amd64-debian-10.tar.gz
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/aws-cli-1.18.57-0-linux-amd64-debian-10.tar.gz && \
-    echo "8fd54b710f7dceef649c03427511e76f7174e19363b7ed49d41845bb2beb627d  /tmp/bitnami/pkg/cache/aws-cli-1.18.57-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/aws-cli-1.18.57-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/aws-cli-1.18.57-0-linux-amd64-debian-10.tar.gz
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/aws-cli-1.18.58-0-linux-amd64-debian-10.tar.gz && \
+    echo "209e9799e708ef886c398d9fb241dadee7416b72e65b4bd77d890d22db9d94f5  /tmp/bitnami/pkg/cache/aws-cli-1.18.58-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/aws-cli-1.18.58-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/aws-cli-1.18.58-0-linux-amd64-debian-10.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 
 ENV BITNAMI_APP_NAME="aws-cli" \
-    BITNAMI_IMAGE_VERSION="1.18.57-debian-10-r1" \
+    BITNAMI_IMAGE_VERSION="1.18.58-debian-10-r0" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/aws-cli/bin:/opt/bitnami/aws-cli/venv/bin:$PATH"
 
 USER 1001
diff --git a/bitnami/aws-cli/README.md b/bitnami/aws-cli/README.md
index 950b6f0a5fb7..b4fee65620da 100644
--- a/bitnami/aws-cli/README.md
+++ b/bitnami/aws-cli/README.md
@@ -28,7 +28,7 @@ $ docker run --name aws-cli bitnami/aws-cli:latest
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`1-debian-10`, `1.18.57-debian-10-r1`, `1`, `1.18.57`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-aws-cli/blob/1.18.57-debian-10-r1/1/debian-10/Dockerfile)
+* [`1-debian-10`, `1.18.58-debian-10-r0`, `1`, `1.18.58`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-aws-cli/blob/1.18.58-debian-10-r0/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/aws-cli GitHub repo](https://github.com/bitnami/bitnami-docker-aws-cli).