diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cdf2fc..08ee95f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,13 +6,23 @@ on:
   pull_request:
     branches:
       - '*'
+permissions:
+  contents: read
 jobs:
   ci:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        java: [ 17 ]
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+        # Keep this list as: all supported LTS JDKs, the latest GA JDK, and optionally the latest EA JDK (if available).
+        # Reference: https://adoptium.net/support/
+        java:
+          - 17
+          - 21
+          - 24
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -23,4 +33,4 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: maven
       - name: Build with Maven
-        run: ./mvnw --batch-mode --no-transfer-progress verify
+        run: ./mvnw --batch-mode --no-transfer-progress clean verify
diff --git a/pom.xml b/pom.xml
index bf87b43..d6bf70d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <maven.compiler.source>17</maven.compiler.source>
 
         <!-- Dependency versions -->
-        <version.mod_cluster>2.0.4.Final</version.mod_cluster>
+        <version.org.jboss.mod_cluster>2.1.0.Final</version.org.jboss.mod_cluster>
 
         <!-- Plugin versions -->
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
@@ -50,47 +50,12 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- mod_cluster -->
-            <!-- TODO replace with a BOM once available -->
             <dependency>
                 <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-container-spi</artifactId>
-                <version>${version.mod_cluster}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-container-tomcat-8.5</artifactId>
-                <version>${version.mod_cluster}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-container-tomcat-9.0</artifactId>
-                <version>${version.mod_cluster}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-core</artifactId>
-                <version>${version.mod_cluster}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-demo</artifactId>
-                <version>${version.mod_cluster}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-demo-client</artifactId>
-                <version>${version.mod_cluster}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-demo-server</artifactId>
-                <version>${version.mod_cluster}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-load-spi</artifactId>
-                <version>${version.mod_cluster}</version>
+                <artifactId>mod_cluster-bom</artifactId>
+                <version>${version.org.jboss.mod_cluster}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -108,7 +73,7 @@
                         <failsOnError>true</failsOnError>
                         <includeTestSourceDirectory>true</includeTestSourceDirectory>
                         <excludes>**/*$logger.java,**/*$bundle.java</excludes>
-                        <useFile />
+                        <useFile/>
                     </configuration>
                     <dependencies>
                         <dependency>