diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6aec9bc0a..f28fb2a01 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
       - name: Set up CI environment
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 6d8e9f5c1..5a0d3e949 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -39,10 +39,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/pom.xml b/pom.xml
index 57254af65..af72c8ec2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,8 @@
     <version>0.3.5-SNAPSHOT</version>
 
     <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <package-name>org.mastodon</package-name>
         <license.licenseName>bsd_2</license.licenseName>
         <license.projectName>mastodon-deep-lineage</license.projectName>