diff --git a/src/docker/Dockerfile-bookworm b/src/docker/Dockerfile-bookworm
index eeeff24a..b3410ccd 100644
--- a/src/docker/Dockerfile-bookworm
+++ b/src/docker/Dockerfile-bookworm
@@ -109,7 +109,7 @@ RUN python3 -m pip \
 # Install AWS CLI, then verify installation
 ARG AWS_CLI_VERSION
 ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
-RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh)-${AWS_CLI_VERSION}.zip -o awscli.zip \
     && unzip -q awscli.zip \
     && ./aws/install \
     && rm -rf awscli.zip aws \
diff --git a/src/docker/Dockerfile-bullseye b/src/docker/Dockerfile-bullseye
index b151519f..7a811c10 100644
--- a/src/docker/Dockerfile-bullseye
+++ b/src/docker/Dockerfile-bullseye
@@ -106,7 +106,7 @@ RUN python3 -m pip \
 # Install AWS CLI, then verify installation
 ARG AWS_CLI_VERSION
 ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
-RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh)-${AWS_CLI_VERSION}.zip -o awscli.zip \
     && unzip -q awscli.zip \
     && ./aws/install \
     && rm -rf awscli.zip aws \
diff --git a/src/docker/Dockerfile-focal b/src/docker/Dockerfile-focal
index a8d40563..a6e51ce0 100644
--- a/src/docker/Dockerfile-focal
+++ b/src/docker/Dockerfile-focal
@@ -105,7 +105,7 @@ RUN python3 -m pip \
 # Install AWS CLI, then verify installation
 ARG AWS_CLI_VERSION
 ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
-RUN curl -LsSf --retry 8 https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+RUN curl -LsSf --retry 8 https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh)-${AWS_CLI_VERSION}.zip -o awscli.zip \
     && unzip -q awscli.zip \
     && ./aws/install \
     && rm -rf awscli.zip aws \
diff --git a/src/docker/Dockerfile-jammy b/src/docker/Dockerfile-jammy
index 1e1d658c..2c9fd25e 100644
--- a/src/docker/Dockerfile-jammy
+++ b/src/docker/Dockerfile-jammy
@@ -104,7 +104,7 @@ RUN python3 -m pip \
 # Install AWS CLI, then verify installation
 ARG AWS_CLI_VERSION
 ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
-RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh)-${AWS_CLI_VERSION}.zip -o awscli.zip \
     && unzip -q awscli.zip \
     && ./aws/install \
     && rm -rf awscli.zip aws \
diff --git a/src/docker/Dockerfile-ubi8 b/src/docker/Dockerfile-ubi8
index bc5ae0eb..bb9431b5 100644
--- a/src/docker/Dockerfile-ubi8
+++ b/src/docker/Dockerfile-ubi8
@@ -101,7 +101,7 @@ RUN python3 -m pip \
 # Install AWS CLI, then verify installation
 ARG AWS_CLI_VERSION
 ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
-RUN curl -LsSf --retry 8 https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+RUN curl -LsSf --retry 8 https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh)-${AWS_CLI_VERSION}.zip -o awscli.zip \
     && unzip -q awscli.zip \
     && ./aws/install \
     && rm -rf awscli.zip aws \
diff --git a/src/docker/Dockerfile-ubi9 b/src/docker/Dockerfile-ubi9
index 427e3899..2db62a62 100644
--- a/src/docker/Dockerfile-ubi9
+++ b/src/docker/Dockerfile-ubi9
@@ -100,7 +100,7 @@ RUN python3.11 -m pip \
 # Install AWS CLI, then verify installation
 ARG AWS_CLI_VERSION
 ENV AWS_CLI_VERSION ${AWS_CLI_VERSION}
-RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh).zip -o awscli.zip \
+RUN curl -LsSf --retry 8 --retry-all-errors https://awscli.amazonaws.com/awscli-exe-linux-$(ARCH_X64=x86_64 ARCH_ARM64=aarch64 bash arch.sh)-${AWS_CLI_VERSION}.zip -o awscli.zip \
     && unzip -q awscli.zip \
     && ./aws/install \
     && rm -rf awscli.zip aws \