diff --git a/1.18/Dockerfile b/1.18/Dockerfile
index 56b12406..dac1a124 100644
--- a/1.18/Dockerfile
+++ b/1.18/Dockerfile
@@ -4,7 +4,7 @@ FROM cibuilds/base:latest
 
 LABEL maintainer="Ricardo N Feliciano (FelicianoTech) <ricardo@feliciano.tech>"
 
-ENV AWS_CLI_VERSION=1.18.57
+ENV AWS_CLI_VERSION=1.18.58
 
 RUN apk --no-cache add \
 		gcc \
diff --git a/build-images.sh b/build-images.sh
index 965ba5ab..9b9c6bec 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker build --file 1.18/Dockerfile -t cibuilds/aws:latest -t cibuilds/aws:1.18.57  -t cibuilds/aws:1.18 .
+docker build --file 1.18/Dockerfile -t cibuilds/aws:latest -t cibuilds/aws:1.18.58  -t cibuilds/aws:1.18 .