diff --git a/.github/workflows/client-angular.yaml b/.github/workflows/client-angular.yaml
index 93ee3a9e..07373136 100644
--- a/.github/workflows/client-angular.yaml
+++ b/.github/workflows/client-angular.yaml
@@ -13,10 +13,10 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
-    - name: Use Node.js 18
+    - name: Use Node.js 20
       uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 20
         cache: 'npm'
         cache-dependency-path: ./client/package-lock.json
 
@@ -34,10 +34,10 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
-    - name: Use Node.js 18
+    - name: Use Node.js 20
       uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 20
         cache: 'npm'
         cache-dependency-path: ./client/package-lock.json
 
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 218a2dfc..cd17b741 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -21,10 +21,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
 
-    - name: Use Node.js 18
+    - name: Use Node.js 20
       uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 20
         cache: 'npm'
         cache-dependency-path: ./client/package-lock.json
 
diff --git a/server/build.gradle b/server/build.gradle
index 5c5af41b..86d28c45 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -12,10 +12,10 @@ plugins {
   id 'checkstyle'
 }
 
-// Build and run the project with Java 17
+// Build and run the project with Java 21
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(17)
+    languageVersion = JavaLanguageVersion.of(21)
   }
 }