diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 32afe06e4aa..5df6b84646c 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -33,4 +33,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -T1C jacoco:prepare-agent verify jacoco:report sonar:sonar -Dversion.jdk.runtime=17 -Dverification.skip -Dsonar.projectKey=PicnicSupermarket_error-prone-support
+        run: mvn -T1C jacoco:prepare-agent verify jacoco:report sonar:sonar -Dverification.skip -Dsonar.projectKey=PicnicSupermarket_error-prone-support
diff --git a/pom.xml b/pom.xml
index 8a351e3e5b8..e9b937a3845 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1856,8 +1856,19 @@
         </profile>
         <profile>
             <id>sonar</id>
+            <activation>
+                <property>
+                    <name>sonar.projectKey</name>
+                </property>
+            </activation>
             <properties>
                 <maven.test.failure.ignore>true</maven.test.failure.ignore>
+                <!-- Normal builds use Jabel to target an older JDK version
+                than would normally supported given the language features used,
+                but this causes Sonar to report parse errors. So for Sonar
+                builds we target a JDK version that is properly compatible with
+                the source code.-->
+                <version.jdk.runtime>${version.jdk.source}</version.jdk.runtime>
             </properties>
         </profile>
         <profile>