diff --git a/.github/workflows/spec-update.yaml b/.github/workflows/spec-update.yaml
index 053a9b210..81c7312fa 100644
--- a/.github/workflows/spec-update.yaml
+++ b/.github/workflows/spec-update.yaml
@@ -59,6 +59,7 @@ jobs:
       pr_url: ${{ steps.create-pr.outputs.pr_url }}
       compilation_result: ${{ steps.compile.outputs.compilation_result }}
       test_result: ${{ steps.compile.outputs.test_result }}
+      api_compat_result: ${{ steps.api_compat.outputs.api_compat_result }}
     env:
       API_BASE_URL: 'https://github.tools.sap/api/v3/repos'
       SERVICE: ${{ github.event.inputs.service }}
@@ -142,25 +143,31 @@ jobs:
             core)
               API_URL="$API_BASE_URL/cloudsdk/cloud-sdk-java-tests/contents/aicore.yaml?ref=$REF"
               FILE_PATH='core/src/main/resources/spec/aicore.yaml'
+              MODULE_PATH='core'
               ;;
             document-grounding)
               API_URL="$API_BASE_URL/AI/rage-proxy-inference/contents/docs/public/business_api_hub/api_hub_merged_spec.yaml?ref=$REF"
               FILE_PATH='core-services/document-grounding/src/main/resources/spec/grounding.yaml'
+              MODULE_PATH='core-services/document-grounding'
               ;;
             orchestration)
               API_URL="$API_BASE_URL/AI/llm-orchestration/contents/src/spec/v2.yaml?ref=$REF"
               FILE_PATH='orchestration/src/main/resources/spec/orchestration.yaml'
+              MODULE_PATH='orchestration'
               ;;
             prompt-registry)
               API_URL="$API_BASE_URL/AI/prompt-registry/contents/src/spec/generated/prompt-registry-combined.yaml?ref=$REF"
               FILE_PATH='core-services/prompt-registry/src/main/resources/spec/prompt-registry.yaml'
+              MODULE_PATH='core-services/prompt-registry'
               ;;
             sap-rpt) # https://github.tools.sap/DL-COE/sap-rpt-1-public-content
               API_URL="$API_BASE_URL/DL-COE/sap-rpt-1-public-content/contents/sap-rpt-1_openapi.json?ref=$REF"
               FILE_PATH='foundation-models/sap-rpt/src/main/resources/spec/sap-rpt-1_openapi.json'
+              MODULE_PATH='foundation-models/sap-rpt'
               ;;
           esac
 
+          echo "module_path=$MODULE_PATH" >> "$GITHUB_OUTPUT"
           echo "Downloading $SERVICE specification file from $API_URL ..."
 
           gh api "$API_URL" -H "Accept: application/vnd.github.raw" > $FILE_PATH
@@ -215,6 +222,25 @@ jobs:
             fi
           fi
 
+      - name: 'Build baseline JAR'
+        id: baseline
+        if: steps.spec_diff.outputs.spec_diff == 'true'
+        env:
+          MODULE_PATH: ${{ steps.download.outputs.module_path }}
+        run: |
+          # Extract main branch source into a temporary directory
+          git fetch --no-tags --depth=1 origin main
+          mkdir -p /tmp/main-baseline
+          git archive origin/main | tar -x -C /tmp/main-baseline
+
+          # Build from within the baseline directory
+          cd /tmp/main-baseline
+          mvn package -DskipTests -pl "$MODULE_PATH" -am ${{ env.MVN_MULTI_THREADED_ARGS }}
+
+          # Copy the baseline JAR to a known location
+          cp /tmp/main-baseline/$MODULE_PATH/target/*.jar /tmp/baseline.jar
+          echo "Baseline JAR ready: $(ls -lh /tmp/baseline.jar)"
+
       - name: 'Generate'
         id: generate
         if: steps.spec_diff.outputs.spec_diff == 'true'
@@ -225,6 +251,37 @@ jobs:
             echo "generation_result=failure" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: 'API compatibility check'
+        id: api_compat
+        if: >
+          steps.spec_diff.outputs.spec_diff == 'true' &&
+          steps.generate.outputs.generation_result == 'success'
+        env:
+          MODULE_PATH: ${{ steps.download.outputs.module_path }}
+        run: |
+          # Debug: output effective POM to verify japicmp configuration
+          mvn help:effective-pom -pl "$MODULE_PATH" -Doutput=/tmp/effective-pom.xml ${{ env.MVN_MULTI_THREADED_ARGS }}
+          cat /tmp/effective-pom.xml
+
+          # Run japicmp: compare baseline (main) JAR vs newly generated JAR
+          if mvn com.github.siom79.japicmp:japicmp-maven-plugin:cmp -pl "$MODULE_PATH" \
+            ${{ env.MVN_MULTI_THREADED_ARGS }} ; then
+            echo "api_compat_result=compatible" >> "$GITHUB_OUTPUT"
+          else
+            echo "api_compat_result=incompatible" >> "$GITHUB_OUTPUT"
+            echo "## ❌ API Compatibility: Breaking changes detected" >> $GITHUB_STEP_SUMMARY
+            echo "Download the **japicmp-report** artifact for details." >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+
+      - name: 'Upload japicmp report'
+        if: always() && steps.api_compat.outcome != 'skipped'
+        uses: actions/upload-artifact@v4
+        with:
+          name: japicmp-report
+          path: ${{ steps.download.outputs.module_path }}/target/japicmp/
+          if-no-files-found: ignore
+
       - name: 'Compile and Test'
         id: compile
         if: steps.spec_diff.outputs.spec_diff == 'true'
@@ -277,6 +334,7 @@ jobs:
 
           - Compilation outcome: ${{ steps.compile.outputs.compilation_result }}
           - Test run outcome: ${{ steps.compile.outputs.test_result }}
+          - API compatibility: ${{ steps.api_compat.outputs.api_compat_result || 'skipped' }}
 
           Before merging, make sure to update tests and release notes, if necessary.
 
@@ -313,6 +371,7 @@ jobs:
             echo "| Client Generation | ${{ steps.generate.outputs.generation_result == 'success' && '✅' || '❌' }} ${{ steps.generate.outputs.generation_result }}" >> $GITHUB_STEP_SUMMARY
             echo "| Client Compilation | ${{ steps.compile.outputs.compilation_result == 'success' && '✅' || '❌' }} ${{ steps.compile.outputs.compilation_result }}" >> $GITHUB_STEP_SUMMARY
             echo "| Client Testing | ${{ steps.compile.outputs.test_result == 'success' && '✅' || steps.compile.outputs.test_result == 'skipped' && '⏩' || '❌' }} ${{ steps.compile.outputs.test_result }}" >> $GITHUB_STEP_SUMMARY
+            echo "| API Compatibility | ${{ steps.api_compat.outputs.api_compat_result == 'compatible' && '✅' || steps.api_compat.outputs.api_compat_result == 'incompatible' && '❌' || '⏩' }} ${{ steps.api_compat.outputs.api_compat_result || 'skipped' }}" >> $GITHUB_STEP_SUMMARY
             echo "| Branch Creation | ${{ steps.push.outcome == 'success' && '✅ [Branch Link]($DIFF_URL)' || '❌ failure' }}" >> $GITHUB_STEP_SUMMARY
             echo "| Pull Request Creation | ${{ env.CREATE_PR == 'false' && '⏩ skipped' || '' }}${{ env.CREATE_PR == 'true' && steps.push.outcome == 'success' && '✅ [PR Link]($PR_URL)' || '' }}" >> $GITHUB_STEP_SUMMARY
           fi
diff --git a/core-services/document-grounding/pom.xml b/core-services/document-grounding/pom.xml
index 99b839e17..659240b2c 100644
--- a/core-services/document-grounding/pom.xml
+++ b/core-services/document-grounding/pom.xml
@@ -99,6 +99,23 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.siom79.japicmp</groupId>
+        <artifactId>japicmp-maven-plugin</artifactId>
+        <configuration>
+          <parameter>
+            <includes>
+              <include>com.sap.ai.sdk.grounding.client</include>
+              <include>com.sap.ai.sdk.grounding.model</include>
+            </includes>
+          </parameter>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>generate</id>
diff --git a/core-services/prompt-registry/pom.xml b/core-services/prompt-registry/pom.xml
index 84da5e724..a5460e6d8 100644
--- a/core-services/prompt-registry/pom.xml
+++ b/core-services/prompt-registry/pom.xml
@@ -109,6 +109,23 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.siom79.japicmp</groupId>
+        <artifactId>japicmp-maven-plugin</artifactId>
+        <configuration>
+          <parameter>
+            <includes>
+              <include>com.sap.ai.sdk.prompt.registry.client</include>
+              <include>com.sap.ai.sdk.prompt.registry.model</include>
+            </includes>
+          </parameter>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>generate</id>
diff --git a/core/pom.xml b/core/pom.xml
index 8a334b131..42182babf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -140,6 +140,23 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.siom79.japicmp</groupId>
+        <artifactId>japicmp-maven-plugin</artifactId>
+        <configuration>
+          <parameter>
+            <includes>
+              <include>com.sap.ai.sdk.core.client</include>
+              <include>com.sap.ai.sdk.core.model</include>
+            </includes>
+          </parameter>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>generate</id>
diff --git a/foundation-models/sap-rpt/pom.xml b/foundation-models/sap-rpt/pom.xml
index 111d60f8f..1d6727c93 100644
--- a/foundation-models/sap-rpt/pom.xml
+++ b/foundation-models/sap-rpt/pom.xml
@@ -181,6 +181,17 @@
           </ignoredUnusedDeclaredDependencies>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.github.siom79.japicmp</groupId>
+        <artifactId>japicmp-maven-plugin</artifactId>
+        <configuration>
+          <parameter>
+            <includes>
+              <include>com.sap.ai.sdk.foundationmodels.rpt.generated</include>
+            </includes>
+          </parameter>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <profiles>
diff --git a/orchestration/pom.xml b/orchestration/pom.xml
index a0894d96a..964a3d63b 100644
--- a/orchestration/pom.xml
+++ b/orchestration/pom.xml
@@ -168,6 +168,22 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.siom79.japicmp</groupId>
+        <artifactId>japicmp-maven-plugin</artifactId>
+        <configuration>
+          <parameter>
+            <includes>
+              <include>com.sap.ai.sdk.orchestration.model</include>
+            </includes>
+          </parameter>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>generate</id>
diff --git a/pom.xml b/pom.xml
index 827165185..453a522a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
     <jackson.version>2.21.3</jackson.version>
     <logback.version>1.5.32</logback.version>
     <commons-codec.version>1.22.0</commons-codec.version>
+    <japicmp.version>0.25.7</japicmp.version>
     <!-- conflicts resolution -->
     <micrometer.version>1.16.5</micrometer.version>
     <json.version>20251224</json.version>
@@ -94,6 +95,8 @@
     <coverage.branch>100%</coverage.branch>
     <coverage.method>100%</coverage.method>
     <coverage.class>100%</coverage.class>
+    <!--  Binary compatibility check old version file -->
+    <japicmp.oldVersion.file/>
   </properties>
 
   <dependencyManagement>
@@ -300,6 +303,31 @@
           <artifactId>openapi-generator-maven-plugin</artifactId>
           <version>7.22.0</version>
         </plugin>
+        <plugin>
+          <groupId>com.github.siom79.japicmp</groupId>
+          <artifactId>japicmp-maven-plugin</artifactId>
+          <version>${japicmp.version}</version>
+          <configuration>
+            <oldVersion>
+              <file>
+                <path>/tmp/baseline.jar</path>
+              </file>
+            </oldVersion>
+            <newVersion>
+              <file>
+                <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+              </file>
+            </newVersion>
+            <parameter>
+              <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+              <breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
+              <onlyModified>true</onlyModified>
+              <accessModifier>public</accessModifier>
+              <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+              <ignoreMissingOldVersion>false</ignoreMissingOldVersion>
+            </parameter>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>