diff --git a/.github/workflows/build_fj-doc-native-quarkus_test.yml b/.github/workflows/build_fj-doc-native-quarkus_test.yml
index 69c9a0be..7114576e 100644
--- a/.github/workflows/build_fj-doc-native-quarkus_test.yml
+++ b/.github/workflows/build_fj-doc-native-quarkus_test.yml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       matrix:
         distribution: [ 'graalvm' ]
-        java: [ '21', '23' ]
+        java: [ '21', '24' ]
         os: [ 'ubuntu-latest', 'ubuntu-24.04-arm', 'windows-latest' ]
     name: Build native image ${{ matrix.os }} ${{ matrix.java }} (${{ matrix.distribution }})
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d75ca2e..928c0a8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- graalvm '24' instead of '23' for build_fj-doc-native-quarkus_test.yml workflow
+- quarkus-version set to 3.21.3 across all the modules <https://github.com/fugerit-org/fj-doc/pull/388>
+
 ## [8.12.8] - 2025-04-16
 
 ### Changed
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/flavour_versions_default.properties b/fj-doc-maven-plugin/src/main/resources/config/flavour/flavour_versions_default.properties
index 10c8cc83..c6d998e3 100644
--- a/fj-doc-maven-plugin/src/main/resources/config/flavour/flavour_versions_default.properties
+++ b/fj-doc-maven-plugin/src/main/resources/config/flavour/flavour_versions_default.properties
@@ -1,8 +1,8 @@
 # default flavour versions
-quarkus-3=3.21.2
-quarkus-3-gradle=3.21.2
-quarkus-3-gradle-kts=3.21.2
-quarkus-3-properties=3.21.2
+quarkus-3=3.21.3
+quarkus-3-gradle=3.21.3
+quarkus-3-gradle-kts=3.21.3
+quarkus-3-properties=3.21.3
 quarkus-2=2.16.12.Final
 micronaut-4=4.7.6
 springboot-3=3.4.4
diff --git a/pom.xml b/pom.xml
index 55fa9ce2..4a9fafc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 	    <jajarta-jaxb-impl-version>4.0.5</jajarta-jaxb-impl-version>
 	    <poi5-version>${poi-version}</poi5-version>
 		<kotlin.version>2.1.20</kotlin.version>
-		<quarkus-version>3.21.2</quarkus-version>
+		<quarkus-version>3.21.3</quarkus-version>
 	</properties>
 
 	<licenses>