diff --git a/Dockerfile b/Dockerfile
index c27f5fd..0caf513 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN \
   apt-get install --no-install-recommends -y \
     jsvc \
     logrotate \
-    openjdk-17-jre-headless \
+    openjdk-21-jre-headless \
     unzip && \
   echo "**** install unifi ****" && \
   if [ -z ${UNIFI_VERSION+x} ]; then \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 77a4f04..9d4f7a2 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -19,7 +19,7 @@ RUN \
   apt-get install --no-install-recommends -y \
     jsvc \
     logrotate \
-    openjdk-17-jre-headless \
+    openjdk-21-jre-headless \
     unzip && \
   echo "**** install unifi ****" && \
   if [ -z ${UNIFI_VERSION+x} ]; then \
diff --git a/README.md b/README.md
index 50b0884..841c384 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ After setup, the web UI is available at https://ip:8443. The application can be
 
 ### Setting Up Your External Database
 
-Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported.
+Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported. Starting with version 9.0 of Unifi Network Application, mongodb 8.0 is supported.
 
 **Make sure you pin your database image version and do not use `latest`, as mongodb does not support automatic upgrades between major versions.**
 
@@ -418,6 +418,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.01.25:** - Bump JRE to 21.
 * **11.08.24:** - **Important**: The mongodb init instructions have been updated to enable auth ([RBAC](https://www.mongodb.com/docs/manual/core/authorization/#role-based-access-control)). We have been notified that if RBAC is not enabled, the official mongodb container allows remote access to the db contents over port 27017 without credentials. If you set up the mongodb container with the old instructions we provided, you should not map or expose port 27017. If you would like to enable auth, the easiest way is to create new instances of both unifi and mongodb with the new instructions and restore unifi from a backup.
 * **11.08.24:** - Rebase to Ubuntu Noble.
 * **04.03.24:** - Install from zip package instead of deb.
diff --git a/readme-vars.yml b/readme-vars.yml
index 11d4711..b0f0b0f 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -51,7 +51,7 @@ app_setup_block: |
 
   ### Setting Up Your External Database
 
-  Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported.
+  Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported. Starting with version 9.0 of Unifi Network Application, mongodb 8.0 is supported.
 
   **Make sure you pin your database image version and do not use `latest`, as mongodb does not support automatic upgrades between major versions.**
 
@@ -175,6 +175,7 @@ init_diagram: |
   "unifi-network-application:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "06.01.25:", desc: "Bump JRE to 21."}
   - {date: "11.08.24:", desc: "**Important**: The mongodb init instructions have been updated to enable auth ([RBAC](https://www.mongodb.com/docs/manual/core/authorization/#role-based-access-control)). We have been notified that if RBAC is not enabled, the official mongodb container allows remote access to the db contents over port 27017 without credentials. If you set up the mongodb container with the old instructions we provided, you should not map or expose port 27017. If you would like to enable auth, the easiest way is to create new instances of both unifi and mongodb with the new instructions and restore unifi from a backup."}
   - {date: "11.08.24:", desc: "Rebase to Ubuntu Noble."}
   - {date: "04.03.24:", desc: "Install from zip package instead of deb."}