diff --git a/.github/workflows/cicd-build.yml b/.github/workflows/cicd-build.yml
index 82c38b4..5e995a8 100644
--- a/.github/workflows/cicd-build.yml
+++ b/.github/workflows/cicd-build.yml
@@ -20,10 +20,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Build with Gradle
diff --git a/common-api/build.gradle b/common-api/build.gradle
index 7f977d4..63fc899 100644
--- a/common-api/build.gradle
+++ b/common-api/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "io.freefair.lombok" version "6.5.0.3"
+    id "io.freefair.lombok" version "8.12"
     id 'java-library'
 }
 
@@ -7,8 +7,9 @@ group = 'bitxon.common'
 version = '1.0-SNAPSHOT'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 repositories {
diff --git a/dropwizard-app/build.gradle b/dropwizard-app/build.gradle
index e0a1f40..1046bb2 100644
--- a/dropwizard-app/build.gradle
+++ b/dropwizard-app/build.gradle
@@ -9,7 +9,7 @@ version = '1.0-SNAPSHOT'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -26,10 +26,10 @@ dependencies {
     implementation 'io.dropwizard:dropwizard-hibernate'
     implementation 'org.mapstruct:mapstruct:1.5.3.Final'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.24'
+    annotationProcessor 'org.projectlombok:lombok:1.18.36'
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.3.Final'
 
-    compileOnly 'org.projectlombok:lombok:1.18.24'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
 
     runtimeOnly 'org.postgresql:postgresql:42.7.5'
 
diff --git a/dropwizard-app/src/main/java/bitxon/dropwizard/resource/AccountResource.java b/dropwizard-app/src/main/java/bitxon/dropwizard/resource/AccountResource.java
index db2a4e6..79cf8f8 100644
--- a/dropwizard-app/src/main/java/bitxon/dropwizard/resource/AccountResource.java
+++ b/dropwizard-app/src/main/java/bitxon/dropwizard/resource/AccountResource.java
@@ -30,7 +30,7 @@
 
 @Path("/accounts")
 @Produces(MediaType.APPLICATION_JSON)
-@RequiredArgsConstructor(onConstructor = @__(@Inject))
+@RequiredArgsConstructor(onConstructor_ = @Inject)
 public class AccountResource {
 
     private final AccountDao dao;
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 033e24c..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..e18bc25 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/micronaut-app/build.gradle b/micronaut-app/build.gradle
index f94de13..e1fa19d 100644
--- a/micronaut-app/build.gradle
+++ b/micronaut-app/build.gradle
@@ -10,7 +10,7 @@ version = '1.0-SNAPSHOT'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
diff --git a/quarkus-app/build.gradle b/quarkus-app/build.gradle
index 563a17f..3c9c5a1 100644
--- a/quarkus-app/build.gradle
+++ b/quarkus-app/build.gradle
@@ -10,7 +10,7 @@ version =  '1.0-SNAPSHOT'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor 'org.projectlombok:lombok:1.18.24'
+    annotationProcessor 'org.projectlombok:lombok:1.18.36'
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.3.Final'
     implementation project(":common-api")
     implementation enforcedPlatform("io.quarkus.platform:quarkus-bom:3.17.8")
@@ -32,7 +32,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-hibernate-orm-panache'
     implementation 'io.quarkus:quarkus-jdbc-postgresql'
     implementation 'org.mapstruct:mapstruct:1.5.3.Final'
-    compileOnly 'org.projectlombok:lombok:1.18.24'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
     testImplementation 'io.quarkus:quarkus-junit5'
     testImplementation 'io.rest-assured:rest-assured'
     testImplementation 'org.testcontainers:junit-jupiter'
diff --git a/quarkus-app/src/main/docker/Dockerfile.jvm b/quarkus-app/src/main/docker/Dockerfile.jvm
index c65c4dd..69bed8c 100644
--- a/quarkus-app/src/main/docker/Dockerfile.jvm
+++ b/quarkus-app/src/main/docker/Dockerfile.jvm
@@ -77,7 +77,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-17:1.18
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.20
 
 ENV LANGUAGE='en_US:en'
 
diff --git a/quarkus-app/src/main/docker/Dockerfile.legacy-jar b/quarkus-app/src/main/docker/Dockerfile.legacy-jar
index c6e7fbf..7aa1784 100644
--- a/quarkus-app/src/main/docker/Dockerfile.legacy-jar
+++ b/quarkus-app/src/main/docker/Dockerfile.legacy-jar
@@ -3,7 +3,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=legacy-jar
+# ./gradlew build -Dquarkus.package.jar.type=legacy-jar
 #
 # Then, build the image with:
 #
@@ -77,7 +77,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-17:1.18
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.20
 
 ENV LANGUAGE='en_US:en'
 
diff --git a/quarkus-app/src/main/docker/Dockerfile.native b/quarkus-app/src/main/docker/Dockerfile.native
index 1fc015a..5c2032e 100644
--- a/quarkus-app/src/main/docker/Dockerfile.native
+++ b/quarkus-app/src/main/docker/Dockerfile.native
@@ -3,7 +3,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=native
+# ./gradlew build -Dquarkus.native.enabled=true
 #
 # Then, build the image with:
 #
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/quarkus-app
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
diff --git a/quarkus-app/src/main/docker/Dockerfile.native-micro b/quarkus-app/src/main/docker/Dockerfile.native-micro
index 183faf4..d881dc6 100644
--- a/quarkus-app/src/main/docker/Dockerfile.native-micro
+++ b/quarkus-app/src/main/docker/Dockerfile.native-micro
@@ -6,7 +6,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=native
+# ./gradlew build -Dquarkus.native.enabled=true
 #
 # Then, build the image with:
 #
diff --git a/spring-app/build.gradle b/spring-app/build.gradle
index b65c967..edc47bd 100644
--- a/spring-app/build.gradle
+++ b/spring-app/build.gradle
@@ -9,7 +9,7 @@ version = '1.0-SNAPSHOT'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }