diff --git a/.github/workflows/java-format-check.yml b/.github/workflows/java-format-check.yml
index b3b93a0891..825611d339 100644
--- a/.github/workflows/java-format-check.yml
+++ b/.github/workflows/java-format-check.yml
@@ -21,6 +21,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
@@ -35,4 +37,9 @@ jobs:
         run: chmod +x gradlew
 
       - name: Run Spotless Check
-        run: ./gradlew spotlessCheck --no-daemon
+        run: |
+          if [ -n "${{github.base_ref}}" ]; then
+            ./gradlew spotlessCheck --no-daemon -PdiffBase=origin/${{github.base_ref}}
+          else
+            ./gradlew spotlessCheck --no-daemon
+          fi
diff --git a/build.gradle b/build.gradle
index 6d846c8700..3b964c3bf0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,11 @@ allprojects {
     apply plugin: 'com.diffplug.spotless'
 
     spotless {
+        def diffBase = findProperty('diffBase')
+ 
+        if (diffBase) {
+            ratchetFrom diffBase
+        }
         java {
             eclipse().configFile("${rootDir}/editor-settings/iplass-codestyle-eclipse/eclipse-java-formatter.xml")
 			importOrder( 'javax', 'java', 'org' , "")