diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c9b6d765..3f91cb952 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Set Image Version
       run: echo "IMAGE_VERSION=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
-    - name: SonarCloud Scan
+    - name: SonarCloud Scan webui, cli
       uses: SonarSource/sonarcloud-github-action@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
@@ -54,11 +54,11 @@ jobs:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: ${{ runner.os }}-gradle
-    - name: Build and analyze
+    - name: SonarCloud Scan server
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: server/gradlew build sonar --info
+      run: server/gradlew --no-daemon -p server build sonar --info
     - name: Build Server Image
       run: docker build -t $SERVER_TAG:$IMAGE_VERSION server
     - name: Push Docker Images