diff --git a/Dockerfile b/Dockerfile
index b266019..385e2f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ COPY . /workspace/app
 RUN gradle clean build -x test
 RUN mkdir -p build/dependency && (cd build/dependency; jar -xf ../libs/*-SNAPSHOT.jar)
 
-FROM eclipse-temurin:17-jdk
+FROM eclipse-temurin:21-jdk
 VOLUME /tmp
 ARG DEPENDENCY=/workspace/app/build/dependency
 COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
diff --git a/build.gradle b/build.gradle
index 038d704..50d2c6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,8 +79,18 @@ sourceSets.main.java.srcDir "$buildDir/generated"
 
 // Automatically generate API documentation on project build:
 // Remark: Only works on Windows
-tasks.register('generateApiDocs', Exec) {
-	commandLine 'cmd', '/c', 'generate_api_doc.bat'
+tasks.register('generateApiDocs') {
+	doLast {
+		try {
+			exec {
+				commandLine 'cmd', '/c', 'generate_api_doc.bat'
+			}
+		} catch (Exception e) {
+			// Catch errors when running api documentation generation.
+			// Errors during doc generation shouldn't cause the whole build to fail
+			println "Failed to generate API documentation: ${e.message}"
+		}
+	}
 }
 
 tasks.named('assemble') {