diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0685063e..3f078e00 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Configure jenv
         run: |
           jenv init -
-          jenv add ${JAVA_HOME_21_X64}
+          jenv add ${JAVA_HOME_25_X64}
       - name: Install Hadolint and add to PATH
         run: |
           sh bin/install-hadolint.sh
@@ -172,7 +172,7 @@ jobs:
       - name: Configure jenv
         run: |
           jenv init -
-          jenv add ${JAVA_HOME_21_X64}
+          jenv add ${JAVA_HOME_25_X64}
       - name: Install nvm at specific version
         run: |
           curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3c30452d..546171de 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Configure jenv
         run: |
           jenv init -
-          jenv add ${JAVA_HOME_21_X64}
+          jenv add ${JAVA_HOME_25_X64}
         working-directory: ${{ github.workspace }}/${{ env.SERVICE_NAME }}/
       - name: Get Date
         id: get-date
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 0f207b70..9c0565e9 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -54,9 +54,9 @@ jobs:
       - uses: actions/setup-java@v5
         if: ${{ matrix.language == 'java' }}
         with:
-          distribution: 'corretto'
-          java-version: 21
-          cache: 'gradle'
+          distribution: "corretto"
+          java-version-file: "backend/.java-version"
+          cache: "gradle"
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
         with:
diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml
index 919cbef8..fcfadd6f 100644
--- a/.github/workflows/on-pr.yaml
+++ b/.github/workflows/on-pr.yaml
@@ -51,7 +51,7 @@ jobs:
       - name: Configure jenv
         run: |
           jenv init -
-          jenv add ${JAVA_HOME_21_X64}
+          jenv add ${JAVA_HOME_25_X64}
       - name: Install Hadolint and add to PATH
         run: |
           sh bin/install-hadolint.sh
diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
index 67a927a3..b8ff91e4 100644
--- a/.github/workflows/trivy.yaml
+++ b/.github/workflows/trivy.yaml
@@ -40,7 +40,7 @@ jobs:
         if: steps.boot-jar.outputs.cache-hit != 'true'
         run: |
           jenv init -
-          jenv add ${JAVA_HOME_21_X64}
+          jenv add ${JAVA_HOME_25_X64}
       - name: Install nvm at specific version
         run: |
           curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index bd75a0d2..371c5273 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -16,9 +16,9 @@ jobs:
         uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '21'
-          cache: 'gradle'
+          distribution: "temurin"
+          java-version-file: "backend/.java-version"
+          cache: "gradle"
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v2
         with:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a7b52866..49b32b1b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ If you are not sure how to begin contributing to GitactionBoard, have a look at
 ### Prerequisites
 
 - [jEnv](https://www.jenv.be/)
-- Java 21
+- Java 25
 - [Docker](https://www.docker.com/)
 - [Hadolint](https://github.com/hadolint/hadolint)
 - [ShellCheck](https://www.shellcheck.net/)
diff --git a/Dockerfile b/Dockerfile
index 3f07f14d..6f12a6ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:21-alpine AS corretto-deps
+FROM amazoncorretto:25-alpine AS corretto-deps
 
 COPY ./backend/build/libs/gitactionboard.jar /app/
 
@@ -12,7 +12,7 @@ RUN unzip /app/gitactionboard.jar -d temp &&  \
       --module-path="./temp/BOOT-INF/lib/*" \
       /app/gitactionboard.jar > /modules.txt
 
-FROM amazoncorretto:21-alpine AS corretto-jdk
+FROM amazoncorretto:25-alpine AS corretto-jdk
 
 COPY --from=corretto-deps /modules.txt /modules.txt
 
diff --git a/backend/.java-version b/backend/.java-version
index 5f39e914..be8e64f5 100644
--- a/backend/.java-version
+++ b/backend/.java-version
@@ -1 +1 @@
-21.0
+25.0