diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a7726390f9..ab39626416 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -58,8 +58,8 @@ jobs:
 
       - name: Update the frontend package.json appVersion
         run: |
-          npm install -g json
-          json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'"
+          sudo npm install -g json
+          sudo json -I -f frontend/package.json -e "this.version='${{ github.ref_name }}'"
 
       - name: Prepare Helm release
         uses: peter-evans/create-pull-request@v6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d65a8b19f8..6f37bd87fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 _**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_
 ## [UNRELEASED - DD.MM.YYYY]
+### Added
+-
+### Changed
+-
+### Removed
+-
+## [10.8.4 - 17.04.2024]
 
 ### Added
 - #780 store api documenation in docs/api to conform with TRG 1.08
diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md
index cfb82efdcc..c297557dc1 100644
--- a/COMPATIBILITY_MATRIX.md
+++ b/COMPATIBILITY_MATRIX.md
@@ -1,5 +1,7 @@
 # Compatibility matrix Trace-X
 
+## Trace-X version [[10.8.4](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.8.4)] - 2024-04-17
+- No changes to 10.8.1
 ## Trace-X version [[10.8.1](https://github.com/eclipse-tractusx/traceability-foss/releases/tag/10.8.1)] - 2024-04-03
 
 ### Catena-X Release?
diff --git a/charts/traceability-foss/CHANGELOG.md b/charts/traceability-foss/CHANGELOG.md
index f5496e08c9..9265b4fc0b 100644
--- a/charts/traceability-foss/CHANGELOG.md
+++ b/charts/traceability-foss/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.36] - 2024-04-17
+### No changes
+
+## [1.3.35] - 2024-04-17
+### No changes
+
 ## [1.3.34] - 2024-04-04
 ### No changes
 
diff --git a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts
index 0b4f033429..ba53532051 100644
--- a/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts
+++ b/frontend/src/app/modules/page/notifications/detail/edit/notification-edit.component.ts
@@ -258,7 +258,14 @@ export class NotificationEditComponent implements OnDestroy {
     });
 
     if (!this.affectedPartIds || this.affectedPartIds.length === 0) {
-      this.partsFacade.setSupplierPartsAsBuiltSecondEmpty();
+      if ( this.selectedNotification.type === NotificationType.INVESTIGATION){
+        this.partsFacade.setSupplierPartsAsBuiltSecondEmpty();
+        this.partsFacade.setSupplierPartsAsBuilt();
+      } else{
+        this.ownPartsFacade.setPartsAsBuiltSecondEmpty();
+        this.ownPartsFacade.setPartsAsBuilt();
+      }
+
       this.isSaveButtonDisabled = true;
     } else {
       this.isSaveButtonDisabled = this.notificationFormGroup.invalid || this.affectedPartIds.length < 1;
diff --git a/frontend/src/app/modules/page/parts/core/parts.facade.ts b/frontend/src/app/modules/page/parts/core/parts.facade.ts
index 125b2f0ffd..7033a8beb9 100644
--- a/frontend/src/app/modules/page/parts/core/parts.facade.ts
+++ b/frontend/src/app/modules/page/parts/core/parts.facade.ts
@@ -67,6 +67,14 @@ export class PartsFacade {
     });
   }
 
+  public setPartsAsBuiltSecondEmpty(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], assetAsBuiltFilter?: AssetAsBuiltFilter, isOrSearch?: boolean): void {
+    this.partsAsBuiltSubscriptionSecond?.unsubscribe();
+    this.partsAsBuiltSubscriptionSecond = this.partsService.getPartsAsBuilt(page, pageSize, sorting, assetAsBuiltFilter, isOrSearch).subscribe({
+      next: data => (this.partsState.partsAsBuiltSecond = { data: provideDataObject(null) }),
+      error: error => (this.partsState.partsAsBuiltSecond = { error }),
+    });
+  }
+
   public setPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], assetAsPlannedFilter?: AssetAsPlannedFilter, isOrSearch?: boolean): void {
     this.partsAsPlannedSubscription?.unsubscribe();
     this.partsAsPlannedSubscription = this.partsService.getPartsAsPlanned(page, pageSize, sorting, assetAsPlannedFilter, isOrSearch).subscribe({