diff --git a/.github/workflows/h2-test.yml b/.github/workflows/h2-test.yml
index 78930184..a18e68f1 100644
--- a/.github/workflows/h2-test.yml
+++ b/.github/workflows/h2-test.yml
@@ -26,6 +26,9 @@ jobs:
           - { java-version: 17, scala-version: 2.12, sbt-opts: '' }
           - { java-version: 17, scala-version: 2.13, sbt-opts: '' }
           - { java-version: 17, scala-version: 3.3,  sbt-opts: '' }
+          - { java-version: 21, scala-version: 2.12, sbt-opts: '' }
+          - { java-version: 21, scala-version: 2.13, sbt-opts: '' }
+          - { java-version: 21, scala-version: 3.3,  sbt-opts: '' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/project/project-info.conf b/project/project-info.conf
index 3d222ebe..ff2faf50 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -2,7 +2,7 @@ project-info {
   version: "current"
   scaladoc: "https://pekko.apache.org/api/pekko-persistence-jdbc/"${project-info.version}"/org/apache/pekko/persistence/jdbc/"
   shared-info {
-    jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17"]
+    jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17", "OpenJDK 21"]
     snapshots: {
       url: "snapshots.html"
       text: "Snapshots are available"