diff --git a/.github/workflows/changelog-updates.yaml b/.github/workflows/changelog-updates.yaml
new file mode 100644
index 0000000000..bf4fdf8fc5
--- /dev/null
+++ b/.github/workflows/changelog-updates.yaml
@@ -0,0 +1,33 @@
+name: "Check if CHANGELOG file was modified in PR"
+
+on:
+  pull_request:
+    branches: main
+    paths-ignore:
+      - '**/*.txt'
+      - '.config/**'
+      - 'docs/**'
+      - 'local/**'
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+
+    name: changelog-check
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Verify Changed files
+        uses: tj-actions/verify-changed-files@v16
+        id: verify-changed-files
+        with:
+          files: |
+            CHANGELOG.md
+
+      - name: When CHANGELOG did not change
+        if: steps.verify-changed-files.outputs.files_changed == 'false'
+        run: |
+          echo "Changed files: ${{ steps.verify-changed-files.outputs.changed_files }}"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d04375a9a6..19695b7258 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -78,6 +78,8 @@ cp local/development/commit-msg .git/hooks/commit-msg && chmod 500 .git/hooks/co
 
 For further information please see https://github.com/hazcod/semantic-commit-hook
 
+## Code formatting 
+Please use the following code formatter: https://github.com/eclipse-tractusx/item-relationship-service/tree/main/.idea/codeStyles
 
 ## Contact
 
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 9cf69e6a42..80cb5990bd 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -170,7 +170,7 @@ maven/mavencentral/io.rest-assured/xml-path/5.3.0, Apache-2.0, approved, #9267
 maven/mavencentral/io.rest-assured/xml-path/5.3.2, Apache-2.0, approved, #9267
 maven/mavencentral/io.suzaku/boopickle_2.13/1.3.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.15, Apache-2.0, approved, #5947
-maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.16, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.16, Apache-2.0, approved, #11362
 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.15, Apache-2.0, approved, #5929
 maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.15, Apache-2.0, approved, #5919
 maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java
index 4a80aacb95..e0efe30149 100644
--- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java
+++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/bpn/validation/BPNIncidentValidation.java
@@ -83,7 +83,7 @@ public static SupplyChainImpacted jobContainsIncidentBPNSs(
             final PartSiteInformationAsPlanned partSiteInformationAsPlanned, final List<String> incidentBPNs)
             throws InvalidAspectTypeFormatException {
         if (partSiteInformationAsPlanned.sites().stream().anyMatch(site -> site.catenaXSiteId() == null)) {
-            throw new InvalidAspectTypeFormatException("Site does not contain catenaXSiteId.");
+            throw new InvalidAspectTypeFormatException("'PartSiteInformationAsPlanned' exists, but catenaXSiteId could not be found.");
         }
         final List<String> siteIds = partSiteInformationAsPlanned.getCatenaXSiteId();
         try {
diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java
index 3022047479..19a69f428e 100644
--- a/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java
+++ b/irs-api/src/test/java/org/eclipse/tractusx/irs/ess/service/InvestigationJobProcessingEventListenerTest.java
@@ -330,7 +330,7 @@ void shouldCreateTombstoneWhenSiteIdIsMissing() throws EdcClientException {
         final Optional<BpnInvestigationJob> job = bpnInvestigationJobCache.findByJobId(jobId);
         assertThat(job).isPresent();
         assertThat(job.get().getJobSnapshot().getTombstones()).hasSize(1);
-        assertThat(job.get().getJobSnapshot().getTombstones().get(0).getProcessingError().getErrorDetail()).isEqualTo("Site does not contain catenaXSiteId.");
+        assertThat(job.get().getJobSnapshot().getTombstones().get(0).getProcessingError().getErrorDetail()).isEqualTo("'PartSiteInformationAsPlanned' exists, but catenaXSiteId could not be found.");
     }
 
     private void createMockForJobIdAndShell(final UUID mockedJobId, final String mockedShell,
diff --git a/local/testing/api-tests/irs-api-tests.tavern.yaml b/local/testing/api-tests/irs-api-tests.tavern.yaml
index 632f4cfb2c..d8127916c8 100644
--- a/local/testing/api-tests/irs-api-tests.tavern.yaml
+++ b/local/testing/api-tests/irs-api-tests.tavern.yaml
@@ -493,7 +493,7 @@ stages:
         - function: local.testing.api-tests.tavern_helpers:supplyChainImpacted_is_Unknown
         - function: local.testing.api-tests.tavern_helpers:tombstone_for_EssValidation_are_correct
           extra_kwargs:
-            expectedTombstone: "Site does not contain catenaXSiteId."
+            expectedTombstone: "'PartSiteInformationAsPlanned' exists, but catenaXSiteId could not be found."
       headers:
         content-type: application/json