diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d8150ae17..326a788cf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,10 @@ jobs:
           - macos-12
     runs-on: ${{ matrix.os }}
 
+    env:
+      JAVA_DISTRIBUTION: temurin
+      JAVA_VERSION: 21
+
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -30,12 +34,12 @@ jobs:
         run: |
           mongo --eval "db.version()"
 
-      - name: Set up JDK 17 (Temurin)
+      - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: maven
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: 'maven'
 
       - name: Compile
         run: |
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index 9c25cab3c..ccf7385ec 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -12,7 +12,7 @@ jobs:
 
     env:
       JAVA_DISTRIBUTION: temurin
-      JAVA_VERSION: 17
+      JAVA_VERSION: 21
 
     steps:
       - name: Checkout repository
@@ -39,7 +39,7 @@ jobs:
 
     env:
       JAVA_DISTRIBUTION: temurin
-      JAVA_VERSION: 17
+      JAVA_VERSION: 21
 
     steps:
       - name: Checkout repository
@@ -66,7 +66,7 @@ jobs:
 
     env:
       JAVA_DISTRIBUTION: temurin
-      JAVA_VERSION: 17
+      JAVA_VERSION: 21
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index 832be52d7..9ec56f95d 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -19,7 +19,7 @@ jobs:
 
     env:
       JAVA_DISTRIBUTION: temurin
-      JAVA_VERSION: 17
+      JAVA_VERSION: 21
 
     steps:
       - name: Checkout repository
diff --git a/Dockerfile b/Dockerfile
index 35dc95a17..86a03781f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 #
 
-FROM eclipse-temurin:17-jdk-focal
+FROM eclipse-temurin:21-jdk-alpine
 
 WORKDIR /fdp
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 946815189..f0a435ffe 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -22,7 +22,7 @@
 #
 ################################################################################
 # BUILD STAGE
-FROM maven:3-eclipse-temurin-17-focal as builder
+FROM maven:3-eclipse-temurin-21-alpine as builder
 
 WORKDIR /builder
 
@@ -32,7 +32,7 @@ RUN mvn -q -B -U -ff -DskipTests package
 
 ################################################################################
 # RUN STAGE
-FROM eclipse-temurin:17-jdk-focal
+FROM eclipse-temurin:21-jdk-alpine
 
 WORKDIR /fdp
 
diff --git a/README.md b/README.md
index a0c1b9645..f4393b053 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ e.g. [app.fairdatapoint.org/swagger-ui.html](https://app.fairdatapoint.org/swagg
 
 ### Technology Stack
 
-- **Java** (JDK 17)
+- **Java** (JDK 21)
 - **MongoDB** (4.2)
 - **Maven** (3.2.5 or higher)
 - **Docker** (19.03.0-ce or higher) - *for building Docker image only*
diff --git a/pom.xml b/pom.xml
index 85fccd7c9..8838b716c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Maven -->
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
 
         <!-- Project related -->
         <spring.rdf.migration.version>1.2.0.RELEASE</spring.rdf.migration.version>