diff --git a/toolchain/docker/Dockerfile b/toolchain/docker/Dockerfile
index 6d4b11d959..9462df00bf 100644
--- a/toolchain/docker/Dockerfile
+++ b/toolchain/docker/Dockerfile
@@ -46,9 +46,6 @@ ENV ARCH=${BUILDARCH}
 RUN  apk add --update --no-cache unzip curl jq docker-cli bash python3 py3-pip
 
 RUN wget -q https://github.com/mikefarah/yq/releases/latest/download/yq_linux_$ARCH -O /usr/bin/yq && chmod +x /usr/bin/yq
-RUN wget https://github.com/arangodb-managed/oasisctl/releases/download/v1.19.0/oasisctl.zip && unzip oasisctl.zip
-RUN mv bin/linux/arm/ bin/linux/arm64
-RUN cd bin/linux/$ARCH && mv oasisctl /usr/bin/oasisctl && chmod +x /usr/bin/oasisctl
 
 RUN pip3 install pyyaml
 
diff --git a/toolchain/scripts/toolchain.sh b/toolchain/scripts/toolchain.sh
index b0daa76a59..ee5e79cc23 100755
--- a/toolchain/scripts/toolchain.sh
+++ b/toolchain/scripts/toolchain.sh
@@ -522,6 +522,10 @@ function generate_oasisctl() {
 
   log "[generate_oasisctl] Generate OasisCTL docs"
 
+  if [ ! -f /tmp/oasisctl.zip ]; then
+    log "[generate_oasisctl] /tmp/oasisctl.zip not found. Invoking download_oasisctl"
+    download_oasisctl
+  fi
 
   mkdir -p /tmp/oasisctl
   mkdir -p /tmp/preserve
@@ -551,6 +555,17 @@ function generate_oasisctl() {
   log "[generate_oasisctl] Done"
 }
 
+function download_oasisctl() {
+  oasisctlVersion=$(curl -I https://github.com/arangodb-managed/oasisctl/releases/latest | awk -F '/' '/^location/ {print  substr($NF, 1, length($NF)-1)}')
+  log "[download_oasisctl] Downloading oasisctl version $oasisctlVersion"
+  cd /tmp
+  wget https://github.com/arangodb-managed/oasisctl/releases/download/$oasisctlVersion/oasisctl.zip
+  unzip oasisctl.zip
+  mv bin/linux/arm/ bin/linux/arm64
+  mv bin/linux/amd64/oasisctl /usr/bin/oasisctl && chmod +x /usr/bin/oasisctl
+  cd /home/toolchain/scripts
+}
+
 
 
 ### SYSTEM HANDLERS FUNCTIONS