diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 698fd34b4..595eef8cc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,17 +31,17 @@ jobs:
     - uses: actions/checkout@v2
     - name: Set Image Version
       run: echo "IMAGE_VERSION=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
-    - name: SonarCloud Scan
-      uses: SonarSource/sonarcloud-github-action@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     - name: Build CLI
       run: yarn --cwd cli
     - name: Build Web UI Image
       run: docker build -t $WEBUI_TAG:$IMAGE_VERSION webui
     - name: Run Server Tests
       run: server/gradlew --no-daemon -p server check
+    - name: SonarCloud Scan
+      uses: SonarSource/sonarcloud-github-action@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     - name: Build Server Image
       run: docker build -t $SERVER_TAG:$IMAGE_VERSION server
     - name: Push Docker Images
diff --git a/sonar-project.properties b/sonar-project.properties
index 561175e26..dd614ca26 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,5 +1,6 @@
 sonar.projectKey=open-vsx_openvsx
 sonar.organization=open-vsx
+sonar.java.binaries=server/build/classes
 
 # This is the name and version displayed in the SonarCloud UI.
 #sonar.projectName=openvsx