diff --git a/charts/bpdm/CHANGELOG.md b/charts/bpdm/CHANGELOG.md
index 9a85fc182..508c2ee00 100644
--- a/charts/bpdm/CHANGELOG.md
+++ b/charts/bpdm/CHANGELOG.md
@@ -4,6 +4,25 @@ 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/),
 
+## [4.0.0] - tbd
+
+### Changed
+
+- update application version to 5.0.0
+
+## [3.1.2] - 2023-11-16
+
+### Changed
+
+- update BPDM Pool dependency to 5.1.1
+- remove Opensearch dependency
+
+## [3.1.1] - 2023-11-10
+
+### Changed
+
+- update application version to 4.1.0
+
 ## [3.1.0] - 2023-11-03
 
 ### Added
@@ -19,4 +38,4 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- increase to app version 4.0.1
\ No newline at end of file
+- update application version to 4.0.1
\ No newline at end of file
diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml
index 2b04467b4..925434e8f 100644
--- a/charts/bpdm/Chart.yaml
+++ b/charts/bpdm/Chart.yaml
@@ -22,8 +22,8 @@ apiVersion: v2
 name: bpdm
 type: application
 description: A Helm chart for Kubernetes that deploys the BPDM applications
-version: 3.1.2
-appVersion: "4.1.0"
+version: 4.0.0-alpha.0
+appVersion: "5.0.0-alpha.0"
 home: https://github.com/eclipse-tractusx/bpdm
 sources:
   - https://github.com/eclipse-tractusx/bpdm
@@ -33,30 +33,25 @@ maintainers:
 
 dependencies:
   - name: bpdm-gate
-    version: 4.1.0
+    version: 5.0.0-alpha.0
     alias: bpdm-gate
     condition: bpdm-gate.enabled
   - name: bpdm-pool
-    version: 5.1.0
+    version: 6.0.0-alpha.0
     alias: bpdm-pool
     condition: bpdm-pool.enabled
   - name: bpdm-bridge-dummy
-    version: 1.1.0
+    version: 2.0.0-alpha.0
     alias: bpdm-bridge-dummy
     condition: bpdm-bridge-dummy.enabled
   - name: bpdm-cleaning-service-dummy
-    version: 1.0.2
+    version: 2.0.0-alpha.0
     alias: bpdm-cleaning-service-dummy
     condition: bpdm-cleaning-service-dummy.enabled
   - name: bpdm-orchestrator
-    version: 1.0.1
+    version: 2.0.0-alpha.0
     alias: bpdm-orchestrator
     condition: bpdm-orchestrator.enabled
-  - name: opensearch
-    version: 2.12.2
-    repository: https://opensearch-project.github.io/helm-charts/
-    alias: opensearch
-    condition: opensearch.enabled
   - name: postgresql
     version: 11.9.13
     repository: https://charts.bitnami.com/bitnami
diff --git a/charts/bpdm/charts/bpdm-bridge-dummy/CHANGELOG.md b/charts/bpdm/charts/bpdm-bridge-dummy/CHANGELOG.md
index 6c2c1e8c5..c537ac791 100644
--- a/charts/bpdm/charts/bpdm-bridge-dummy/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-bridge-dummy/CHANGELOG.md
@@ -4,23 +4,29 @@ 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/),
 
+## [2.0.0] - tbd
+
+### Changed
+
+- update application version to 5.0.0
+
 ## [1.1.0] - 2023-11-03
 
 ### Changed
 
-- increase to app version 4.1.0
+- update application version to 4.1.0
 
 ## [1.0.2] - 2023-08-28
 
 ### Changed
 
-- increase to app version 4.0.1
+- update application version to 4.0.1
 
 ## [1.0.1] - 2023-08-18
 
 ### Changed
 
-- increase to app version 4.0.0
+- update application version to 4.0.0
 - add missing license headers to ingress templates
 - change default registry for image to dockerhub
 
diff --git a/charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml
index d69d5c285..35717a2fa 100644
--- a/charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml
+++ b/charts/bpdm/charts/bpdm-bridge-dummy/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-bridge-dummy
-appVersion: "4.1.0"
-version: 1.1.0
+appVersion: "5.0.0-alpha.0"
+version: 2.0.0-alpha.0
 description: A Helm chart for deploying the BPDM bridge dummy service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:
diff --git a/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml b/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml
index 3ff564434..1cfd0fc30 100644
--- a/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml
+++ b/charts/bpdm/charts/bpdm-bridge-dummy/values.yaml
@@ -115,6 +115,8 @@ startupProbe:
 
 # Used to overwrite the default property values of the application configuration
 applicationConfig:
+  server:
+    port: 8083
 #  bpdm:
 #    pool:
 #      base-url: ...
diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md b/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md
index b1da78e50..634a0d534 100644
--- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md
@@ -4,6 +4,24 @@ 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/),
 
+## [2.0.0] - tbd
+
+### Change
+
+- Update application version to 5.0.0
+
+## [1.0.2] - 2023-11-23
+
+### Change
+
+- Update readme outdated information
+
+## [1.0.1] - 2023-11-03
+
+### Change
+
+- Fix faulty inlining of template files
+
 ## [1.0.0] - 2023-11-03
 
 ### Added
diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml
index 40cfb3134..857b2020d 100644
--- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml
+++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-cleaning-service-dummy
-appVersion: "4.1.0"
-version: 1.0.2
+appVersion: "5.0.0-alpha.0"
+version: 2.0.0-alpha.0
 description: A Helm chart for deploying the BPDM cleaning service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:
diff --git a/charts/bpdm/charts/bpdm-gate/CHANGELOG.md b/charts/bpdm/charts/bpdm-gate/CHANGELOG.md
index 5c7346752..b7e2db512 100644
--- a/charts/bpdm/charts/bpdm-gate/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-gate/CHANGELOG.md
@@ -1,26 +1,32 @@
-# Changelog
+^# Changelog
 
 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/),
 
+## [5.0.0] - tbd
+
+### Changed
+
+- Update application version to 5.0.0
+
 ## [4.1.0] - 2023-11-03
 
 ### Changed
 
-- increase to app version 4.1.0
+- Update application version to 4.1.0
 
 ## [4.0.1] - 2023-08-28
 
 ### Changed
 
-- increase to app version 4.0.1
+- Update application version to 4.0.1
 
 ## [4.0.0] - 2023-08-18
 
 ### Changed
 
-- increase to app version 4.0.0
+- Update application version to 4.0.0
 - add missing license headers to ingress templates
 - change default registry for image to dockerhub
 
@@ -32,7 +38,7 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- increase to app version 3.2.0
+- Update application version to 3.2.0
 
 ## [3.2.0] - 2023-03-16
 
@@ -44,19 +50,19 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- increase to app version 3.1.0
+- Update application version to 3.1.0
 
 ## [3.0.6] - 2023-02-24
 
 ### Changed
 
-- increase to app version 3.0.3
+- Update application version to 3.0.3
 
 ## [3.0.5] - 2023-02-16
 
 ### Changed
 
-- support app version 3.0.2
+- Update application version to 3.0.2
 
 ### Fixed
 
@@ -77,7 +83,7 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- AppVersion to 3.0.1
+- Update application version to 3.0.1
 
 ## [3.0.2] - 2022-01-23
 
@@ -89,4 +95,4 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
 ## Changed
 
-- AppVersion to 3.0.0
\ No newline at end of file
+- Update application version to 3.0.0
\ No newline at end of file
diff --git a/charts/bpdm/charts/bpdm-gate/Chart.yaml b/charts/bpdm/charts/bpdm-gate/Chart.yaml
index cc1ba99ab..8ca9c75d3 100644
--- a/charts/bpdm/charts/bpdm-gate/Chart.yaml
+++ b/charts/bpdm/charts/bpdm-gate/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-gate
-appVersion: "4.1.0"
-version: 4.1.0
+appVersion: "5.0.0-alpha.0"
+version: 5.0.0-alpha.0
 description: A Helm chart for deploying the BPDM gate service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:
diff --git a/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md b/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md
index 3a7dbdcfe..1a53ba784 100644
--- a/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md
@@ -4,6 +4,18 @@ 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/),
 
+## [2.0.0] - tbd
+
+### Changed
+
+- Update application version to 5.0.0
+
+## [1.0.1] - 2023-11-23
+
+### Changed
+
+- Fix faulty inlining in template files
+
 ## [1.0.0] - 2023-11-03
 
 ### Added
diff --git a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml
index c7c72d486..54fc447fc 100644
--- a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml
+++ b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-orchestrator
-appVersion: "4.1.0"
-version: 1.0.1
+appVersion: "5.0.0-alpha.0"
+version: 2.0.0-alpha.0
 description: A Helm chart for deploying the BPDM Orchestrator service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:
diff --git a/charts/bpdm/charts/bpdm-pool/CHANGELOG.md b/charts/bpdm/charts/bpdm-pool/CHANGELOG.md
index ac702f715..2c510bfb2 100644
--- a/charts/bpdm/charts/bpdm-pool/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-pool/CHANGELOG.md
@@ -4,6 +4,18 @@ 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/),
 
+## [6.0.0] - tbd
+
+### Changed
+
+- Update application version to 5.0.0
+
+## [5.1.1] - 2023-11-16
+
+### Changed
+
+- remove Opensearch dependency
+
 ## [5.1.0] - 2023-11-03
 
 ### Changed
diff --git a/charts/bpdm/charts/bpdm-pool/Chart.yaml b/charts/bpdm/charts/bpdm-pool/Chart.yaml
index 24ce84522..bc449bbff 100644
--- a/charts/bpdm/charts/bpdm-pool/Chart.yaml
+++ b/charts/bpdm/charts/bpdm-pool/Chart.yaml
@@ -21,18 +21,13 @@
 apiVersion: v2
 type: application
 name: bpdm-pool
-appVersion: "4.1.0"
-version: 5.1.0
+appVersion: "5.0.0-alpha.0"
+version: 6.0.0-alpha.0
 description: A Helm chart for deploying the BPDM pool service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:
   - https://github.com/eclipse-tractusx/bpdm
 dependencies:
-  - name: opensearch
-    version: 2.12.2
-    repository: https://opensearch-project.github.io/helm-charts/
-    alias: opensearch
-    condition: opensearch.enabled
   - name: postgresql
     version: 11.9.13
     repository: https://charts.bitnami.com/bitnami
diff --git a/charts/bpdm/charts/bpdm-pool/templates/configMap.yaml b/charts/bpdm/charts/bpdm-pool/templates/configMap.yaml
index dc13b82f9..d3d379d7a 100644
--- a/charts/bpdm/charts/bpdm-pool/templates/configMap.yaml
+++ b/charts/bpdm/charts/bpdm-pool/templates/configMap.yaml
@@ -29,8 +29,6 @@ data:
     bpdm:
       datasource:
         host: {{ include "bpdm.postgresDependency" . }}
-      opensearch:
-        host: {{ include "bpdm.opensearchDependency" . }}
   external.yml: |-
     # External properties for overwriting application config
     {{- if .Values.applicationConfig }}
diff --git a/charts/bpdm/charts/bpdm-pool/values.yaml b/charts/bpdm/charts/bpdm-pool/values.yaml
index 5fce52a23..66395222e 100644
--- a/charts/bpdm/charts/bpdm-pool/values.yaml
+++ b/charts/bpdm/charts/bpdm-pool/values.yaml
@@ -130,52 +130,3 @@ postgres:
     database: bpdm
     username: bpdm
 
-opensearch:
-  enabled: true
-  replicas: 1
-  protocol: http
-  roles:
-    - master
-    - ingest
-    - data
-  resources:
-    limits:
-      cpu: 300m
-      memory: 2Gi
-    requests:
-      cpu: 100m
-      memory: 2Gi
-  config:
-    opensearch.yml: |
-      cluster.name: opensearch-cluster
-      # Bind to all interfaces because we don't know what
-      # IP address Docker will assign to us.
-      network.host: 0.0.0.0
-      # Disable security
-      plugins.security.disabled: true
-  securityConfig:
-    enabled: false
-  extraInitContainers:
-    # Image that performs the sysctl operation to modify Kernel settings
-    # needed sometimes to avoid boot errors
-    - name: sysctl
-      image: docker.io/bitnami/bitnami-shell:10-debian-10-r199
-      imagePullPolicy: "IfNotPresent"
-      command:
-        - /bin/bash
-        - -ec
-        - |
-          CURRENT=`sysctl -n vm.max_map_count`;
-          DESIRED="262144";
-          if [ "$DESIRED" -gt "$CURRENT" ]; then
-              sysctl -w vm.max_map_count=262144;
-          fi;
-          CURRENT=`sysctl -n fs.file-max`;
-          DESIRED="65536";
-          if [ "$DESIRED" -gt "$CURRENT" ]; then
-              sysctl -w fs.file-max=65536;
-          fi;
-      securityContext:
-        runAsUser: 0
-        privileged: true
-
diff --git a/charts/bpdm/values.yaml b/charts/bpdm/values.yaml
index 1f8fece4b..f8044e519 100644
--- a/charts/bpdm/values.yaml
+++ b/charts/bpdm/values.yaml
@@ -6,10 +6,6 @@ bpdm-gate:
 
 bpdm-pool:
   enabled: true
-  opensearch:
-    enabled: true
-    masterService: ""
-    fullnameOverride: "bpdm-pool-opensearch"
   postgres:
     # use the name that was override on postgres.fullnameOverride to be used by the application on connection
     fullnameOverride: ""
@@ -26,52 +22,6 @@ bpdm-cleaning-service-dummy:
 bpdm-orchestrator:
   enabled: true
 
-
-opensearch:
-  masterService: ""
-  fullnameOverride: "bpdm-pool-opensearch"
-  enabled: true
-  replicas: 1
-  protocol: http
-  roles:
-    - master
-    - ingest
-    - data
-  resources:
-    limits:
-      cpu: 300m
-      memory: 2Gi
-    requests:
-      cpu: 100m
-      memory: 2Gi
-  config:
-    opensearch.yml: |
-      network.host: 0.0.0.0
-      plugins.security.disabled: true
-  securityConfig:
-    enabled: false
-  extraInitContainers:
-    - name: sysctl
-      image: docker.io/bitnami/bitnami-shell:10-debian-10-r199
-      imagePullPolicy: "IfNotPresent"
-      command:
-        - /bin/bash
-        - -ec
-        - |
-          CURRENT=`sysctl -n vm.max_map_count`;
-          DESIRED="262144";
-          if [ "$DESIRED" -gt "$CURRENT" ]; then
-              sysctl -w vm.max_map_count=262144;
-          fi;
-          CURRENT=`sysctl -n fs.file-max`;
-          DESIRED="65536";
-          if [ "$DESIRED" -gt "$CURRENT" ]; then
-              sysctl -w fs.file-max=65536;
-          fi;
-      securityContext:
-        runAsUser: 0
-        privileged: true
-
 postgres:
   # override the name of the postgres deploy
   fullnameOverride: ""