diff --git a/.circleci/base_config.yml b/.circleci/base_config.yml
index f8ebcecc6bcc..084373abc438 100644
--- a/.circleci/base_config.yml
+++ b/.circleci/base_config.yml
@@ -19,7 +19,7 @@ parameters:
     default: ""
   build-docker-image:
     type: string
-    default: "arangodb/ubuntubuildarangodb-devel:15"
+    default: "arangodb/ubuntubuildarangodb-devel:16"
   test-docker-image:
     type: string
     default: public.ecr.aws/b0b8h2r4/test-ubuntu:24.04-5b5ffda4
diff --git a/.circleci/config.yml b/.circleci/config.yml
index b82b55c31608..6b0c0e1ebb48 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,7 +32,7 @@ parameters:
     default: false
   build-docker-image:
     type: string
-    default: "arangodb/ubuntubuildarangodb-devel:15"
+    default: "arangodb/ubuntubuildarangodb-devel:16"
   test-docker-image:
     type: string
     default: public.ecr.aws/b0b8h2r4/test-ubuntu:24.04-e6d3371f
diff --git a/CHANGELOG b/CHANGELOG
index dbca3fadeee8..900541cbbf66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* Upgraded OpenSSL to 3.5.2
+
 * Fix error message to use proper terminology order instead of mode.
 
 * FE-636: bump jest from 27.5.1 to 30.0.5 (latest version) (form-data package is no longer included)
diff --git a/VERSIONS b/VERSIONS
index 043a1ec11f5c..0b422968af22 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -2,7 +2,7 @@ CXX_STANDARD "20"
 STARTER_REV "v0.19.12"
 GCC_LINUX "13.2.0"
 CLANG_LINUX "19.1.7"
-OPENSSL_LINUX "3.5.0"
+OPENSSL_LINUX "3.5.2"
 USE_RCLONE "true"
 RCLONE_GO "1.23.10-3ca85f7"
 RCLONE_VERSION "1.65.2"
diff --git a/scripts/docker/build/linux/Dockerfile.arm64 b/scripts/docker/build/linux/Dockerfile.arm64
index a68529d4a8f5..c780ba9ce24f 100644
--- a/scripts/docker/build/linux/Dockerfile.arm64
+++ b/scripts/docker/build/linux/Dockerfile.arm64
@@ -155,7 +155,7 @@ COPY --from=openmp /opt/omp /opt/omp
 
 COPY ./tools/* /tools/
 
-RUN [ "/tools/install.sh", "3.5", "0" ]
+RUN [ "/tools/install.sh", "3.5", "2" ]
 
 COPY ./scripts /scripts
 
diff --git a/scripts/docker/build/linux/Dockerfile.x86-64 b/scripts/docker/build/linux/Dockerfile.x86-64
index 46f5d6b19256..b4131adef07f 100644
--- a/scripts/docker/build/linux/Dockerfile.x86-64
+++ b/scripts/docker/build/linux/Dockerfile.x86-64
@@ -154,7 +154,7 @@ COPY --from=openmp /opt/omp /opt/omp
 
 COPY ./tools/* /tools/
 
-RUN [ "/tools/install.sh", "3.5", "0" ]
+RUN [ "/tools/install.sh", "3.5", "2" ]
 
 COPY ./scripts /scripts
 
diff --git a/scripts/docker/build/linux/tools/install.sh b/scripts/docker/build/linux/tools/install.sh
index 2c9dc3075f62..0cfc3157aa3e 100755
--- a/scripts/docker/build/linux/tools/install.sh
+++ b/scripts/docker/build/linux/tools/install.sh
@@ -39,7 +39,7 @@ cd /tmp
 rm -rf openssl-$OPENSSLVERSION.tar.gz openssl-$OPENSSLVERSION
 
 # Compile openldap library:
-export OPENLDAPVERSION=2.6.9
+export OPENLDAPVERSION=2.6.10
 cd /tmp
 curl -O ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$OPENLDAPVERSION.tgz
 tar xzf openldap-$OPENLDAPVERSION.tgz