diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index e59b9702af4..5ae3679c2a5 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '17' ]
+        java: [ '17', '21', 'profile-j21' ]
         maven: [ '3.9.6' ]
         os: [ 'ubuntu-22.04' ]
     name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
@@ -46,10 +46,18 @@ jobs:
 
       - name: Set up Java ${{ matrix.java }}
         uses: actions/setup-java@v4
+        if: ${{ matrix.java != 'profile-j21' }}
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
+      - name: Set up Java ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        if: ${{ matrix.java == 'profile-j21' }}
+        with:
+          distribution: 'temurin'
+          java-version: ${{ 21 }}
+
       - name: Set up Maven ${{ matrix.maven }}
         uses: stCarolas/setup-maven@v5
         with:
@@ -62,6 +70,7 @@ jobs:
           echo "::add-matcher::.github/openhab-compile-problems.json"
 
       - name: Build
+        if: ${{ matrix.java != 'profile-j21' }}
         id: build
         run: './.github/scripts/maven-build'
         env:
@@ -71,6 +80,17 @@ jobs:
             -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
+      - name: Build
+        if: ${{ matrix.java == 'profile-j21' }}
+        id: build-j21
+        run: './.github/scripts/maven-build clean verify -B -T 1.5C -U -Pj21'
+        env:
+          MAVEN_OPTS: >-
+            -Xmx2g
+            -Dmaven.wagon.http.retryHandler.count=5
+            -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
       - name: Upload Build Log
         if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
         uses: actions/upload-artifact@v4
@@ -79,7 +99,7 @@ jobs:
           path: build.log
 
       - name: Upload SAT Summary Report
-        if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
+        if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
         uses: actions/upload-artifact@v4
         with:
           name: sat-summary-report