diff --git a/.github/workflows/mvn-deploy.yml b/.github/workflows/mvn-deploy.yml
index 546d829019..8ee4613b45 100644
--- a/.github/workflows/mvn-deploy.yml
+++ b/.github/workflows/mvn-deploy.yml
@@ -29,11 +29,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
           cache: "maven"
           server-id: central
           server-username: MAVEN_USERNAME
diff --git a/.github/workflows/mvn-release.yml b/.github/workflows/mvn-release.yml
index 2b7e125f3f..589e035146 100644
--- a/.github/workflows/mvn-release.yml
+++ b/.github/workflows/mvn-release.yml
@@ -34,11 +34,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
           cache: "maven"
           server-id: central
           server-username: MAVEN_USERNAME
diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml
index 5c19af7caf..12a6da90d5 100644
--- a/.github/workflows/mvn-test.yml
+++ b/.github/workflows/mvn-test.yml
@@ -29,11 +29,11 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
           cache: "maven"
 
       - name: Set up QEMU
@@ -72,11 +72,11 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
           cache: "maven"
 
       - name: Restore Maven artifacts
@@ -159,11 +159,11 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
           cache: "maven"
 
       - name: Restore Maven artifacts
@@ -202,11 +202,11 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
           cache: "maven"
 
       - name: Restore Maven artifacts
@@ -246,11 +246,11 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
           cache: "maven"
 
       - name: Restore Maven artifacts
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000000..0e955afe2e
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-XX:+UseCompactObjectHeaders
diff --git a/package/src/main/docker/Dockerfile b/package/src/main/docker/Dockerfile
index f27b4e4d7f..1de6047ed6 100644
--- a/package/src/main/docker/Dockerfile
+++ b/package/src/main/docker/Dockerfile
@@ -14,11 +14,11 @@
 # limitations under the License.
 #
 
-FROM eclipse-temurin:21-alpine@sha256:df8ce8302ed2ed1690ef490c633981b07e752b373b5fdf796960fb2eb0d640ea
-
+#FROM eclipse-temurin:21-alpine@sha256:df8ce8302ed2ed1690ef490c633981b07e752b373b5fdf796960fb2eb0d640ea
+FROM amazoncorretto:25-alpine3.22@sha256:807ea3c4000a052986cd1e7097a883f9cd7a6e527f73841f462e3d04851b8835
 LABEL maintainer="Arcade Data LTD (info@arcadedb.com)"
 
-ENV JAVA_OPTS="-XX:+UseZGC -XX:+ZGenerational"
+ENV JAVA_OPTS="-XX:+UseZGC -XX:+ZGenerational -XX:+UseCompactObjectHeaders"
 
 ENV ARCADEDB_OPTS_MEMORY="-Xms2G -Xmx2G"