diff --git a/Dockerfile b/Dockerfile
index a574d46f..c3edd31a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # This file is left here for reference, but is no longer used.
 # The preferred way to build a docker image from source is using the Spring Boot CNB feature (./gradlew buildBootImage).
-FROM openjdk:17-jre
+FROM openjdk:21-jre
 WORKDIR /app
 COPY build/libs/*.jar /app/app.jar
 EXPOSE 8080
diff --git a/build.gradle b/build.gradle
index 844de91c..eb6598dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ plugins {
 
 // Java
 java {
-	toolchain { languageVersion = JavaLanguageVersion.of(17) }
+	toolchain { languageVersion = JavaLanguageVersion.of(21) }
 }
 
 // Spring Boot
@@ -40,8 +40,14 @@ processResources.dependsOn(npmBuild)
 sourceSets { main.resources.srcDirs 'ui/dist' }
 clean { delete 'ui/dist' }
 
+//Tests
+test {
+	jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+}
+
+
 // Jacoco test coverage
-jacoco.toolVersion '0.8.7'
+jacoco.toolVersion '0.8.12'
 jacocoTestReport.reports.html.destination file("${buildDir}/reports/coverage/test")
 plugins.withType(JacocoPlugin) {
 	tasks['test'].finalizedBy jacocoTestReport
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 38588005..d6f041d3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,7 +42,9 @@ info:
   java.version: ${java.version}
 
 spring.mvc.async.request-timeout: 600000 # = 10 * 60 * 1000 = 10 minutes. To support streaming downloads of export data.
-resilience4j.bulkhead.instances.export.maxConcurrentCalls: 1
+resilience4j.bulkhead.instances:
+  export:
+    max-concurrent-calls: 1
 
 logging.level:
   org.springframework.web: ERROR