diff --git a/build.gradle b/build.gradle
index 0364a6367..136f5c59c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -198,6 +198,10 @@ subprojects {
             finalizedBy("copySwaggerDoc")
             doNotTrackState("OpenAPI plugin writes outside build directory")
         }
+        tasks.named("spotlessJava") {
+            dependsOn(":common:compileJava")
+            dependsOn(":proprietary:compileJava")
+        }
     }
 }
 
@@ -546,6 +550,12 @@ spotless {
         leadingTabsToSpaces()
         endWithNewline()
     }
+    format 'gradle', {
+        target '*.gradle', 'gradle/*.gradle','**/*.gradle', 'gradle/**/*.gradle', 'app/**/*.gradle'
+        trimTrailingWhitespace()
+        leadingTabsToSpaces()
+        endWithNewline()
+    }
 }
 
 sonar {