diff --git a/docker/mongodb-agent/Dockerfile.atomic b/docker/mongodb-agent/Dockerfile.atomic
index 335407a98..15458c4e4 100644
--- a/docker/mongodb-agent/Dockerfile.atomic
+++ b/docker/mongodb-agent/Dockerfile.atomic
@@ -20,8 +20,11 @@ RUN case ${TARGETPLATFORM} in \
     && mkdir -p /tools \
     && curl -o /tools/mongodb_tools.tgz "${mongodb_tools_url}/${MONGODB_TOOLS_VERSION}"
 
-RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
-    && rm /tools/mongodb_tools.tgz
+RUN tar xfz /tools/mongodb_tools.tgz \
+    && mv mongodb-database-tools-*/bin/* /tools \
+    && chmod +x /tools/* \
+    && rm /tools/mongodb_tools.tgz \
+    && rm -r mongodb-database-tools-*
 
 FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi9/ubi-minimal AS agent_downloader
 
diff --git a/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh b/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh
index 7bdf8164c..f565a63ea 100755
--- a/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh
+++ b/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh
@@ -206,10 +206,10 @@ else
     ln -sf "${MONGOD_ROOT}/bin/mongod" ${mdb_downloads_dir}/mongod/bin/mongod
     ln -sf "${MONGOD_ROOT}/bin/mongos" ${mdb_downloads_dir}/mongod/bin/mongos
 
-    ln -sf "/tools/mongodump" ${mdb_downloads_dir}/mongod/bin/mongodump
-    ln -sf "/tools/mongorestore" ${mdb_downloads_dir}/mongod/bin/mongorestore
-    ln -sf "/tools/mongoexport" ${mdb_downloads_dir}/mongod/bin/mongoexport
-    ln -sf "/tools/mongoimport" ${mdb_downloads_dir}/mongod/bin/mongoimport
+    for tool in mongoimport mongodump mongorestore mongoexport; do
+      [ -e "/tools/${tool}" ] || { echo "/tools/${tool} not found"; exit 1; }
+      ln -sf "/tools/${tool}" ${mdb_downloads_dir}/mongod/bin/${tool}
+    done
   else
     echo "Mongod PID not found within the specified time."
     exit 1