diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 64d1cd49513..b72d64cab8a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,10 +33,16 @@ jobs:
       with:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
+    - name: Gradle / spotless
+      uses: gradle/gradle-build-action@v2
+      with:
+        # 'spotlessCheck' separate: workaround until https://github.com/diffplug/spotless/issues/1215 is fixed
+        arguments: spotlessCheck
+
     - name: Gradle / compile
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: spotlessCheck checkstyleMain checkstyleTest jar testClasses testJar
+        arguments: checkstyleMain checkstyleTest jar testClasses testJar
 
     - name: Gradle / unit test
       uses: gradle/gradle-build-action@v2
@@ -46,7 +52,8 @@ jobs:
     - name: Gradle / check incl. integ-test
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: check
+        # '-x spotlessCheck': workaround until https://github.com/diffplug/spotless/issues/1215 is fixed
+        arguments: check -x spotlessCheck
 
     - name: Gradle / Gatling simulations
       uses: gradle/gradle-build-action@v2
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index e0b26f916e8..d4dcd06dbba 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -51,10 +51,16 @@ jobs:
     - name: Setup Java, Maven
       uses: ./.github/actions/dev-tool-java
 
+    - name: Gradle / spotless
+      uses: gradle/gradle-build-action@v2
+      with:
+        # 'spotlessCheck' separate: workaround until https://github.com/diffplug/spotless/issues/1215 is fixed
+        arguments: spotlessCheck
+
     - name: Gradle / compile
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: spotlessCheck checkstyleMain checkstyleTest jar testClasses testJar
+        arguments: checkstyleMain checkstyleTest jar testClasses testJar
 
     - name: Gradle / unit test
       uses: gradle/gradle-build-action@v2
@@ -66,7 +72,8 @@ jobs:
     - name: Gradle / check incl. integ-test
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: check
+        # '-x spotlessCheck': workaround until https://github.com/diffplug/spotless/issues/1215 is fixed
+        arguments: check -x spotlessCheck
 
     - name: Gradle / Gatling simulations
       uses: gradle/gradle-build-action@v2