diff --git a/.github/workflows/chart-test-lint.yaml b/.github/workflows/chart-test-lint.yaml
index 6f5229df1..122c16170 100644
--- a/.github/workflows/chart-test-lint.yaml
+++ b/.github/workflows/chart-test-lint.yaml
@@ -49,11 +49,15 @@ jobs:
         id: checkRelease
         run: |
           CHART_VERSION=$(grep 'version:' ./charts/bpdm/Chart.yaml | head -n1 | awk '{ print $2}')
-          SNAPSHOT=$(echo $CHART_VERSION | grep 'SNAPSHOT')
+          echo "CHART_VERSION: $CHART_VERSION"
+          SNAPSHOT=$(echo "$CHART_VERSION" | grep 'SNAPSHOT' || echo "" )
+          echo "SNAPSHOT: $SNAPSHOT"
           if [[ -z "$SNAPSHOT" ]]; then 
-            IS_RELEASE=true; else 
+            IS_RELEASE=true 
+          else 
             IS_RELEASE=false 
           fi
+          echo "IS_RELEASE: $IS_RELEASE"
           echo "isRelease=$IS_RELEASE" >> $GITHUB_OUTPUT
 
       - name: Set up Helm
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
index 62764e639..08da63393 100644
--- a/.github/workflows/helm-chart-release.yaml
+++ b/.github/workflows/helm-chart-release.yaml
@@ -41,11 +41,15 @@ jobs:
         id: checkRelease
         run: |
           CHART_VERSION=$(grep 'version:' ./charts/bpdm/Chart.yaml | head -n1 | awk '{ print $2}')
-          SNAPSHOT=$(echo $CHART_VERSION | grep 'SNAPSHOT')
+          echo "CHART_VERSION: $CHART_VERSION"
+          SNAPSHOT=$(echo "$CHART_VERSION" | grep 'SNAPSHOT' || echo "" )
+          echo "SNAPSHOT: $SNAPSHOT"
           if [[ -z "$SNAPSHOT" ]]; then 
-          IS_RELEASE=true; else 
-          IS_RELEASE=false 
+            IS_RELEASE=true 
+          else 
+            IS_RELEASE=false 
           fi
+          echo "IS_RELEASE: $IS_RELEASE"
           echo "isRelease=$IS_RELEASE" >> $GITHUB_OUTPUT
 
       - name: Configure Git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b8ec0fe8..b4f303769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
 For changes to the BPDM Helm charts please consult the [changelog](charts/bpdm/CHANGELOG.md) of the charts directly.
 
-## [6.1.0] - [tbd]
+## [6.1.0] - [2024-07-15]
 
 ### Added
 
diff --git a/bpdm-cleaning-service-dummy/pom.xml b/bpdm-cleaning-service-dummy/pom.xml
index 3e6750c5c..c55d19bdf 100644
--- a/bpdm-cleaning-service-dummy/pom.xml
+++ b/bpdm-cleaning-service-dummy/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <dependencies>
diff --git a/bpdm-common-test/pom.xml b/bpdm-common-test/pom.xml
index 115b3ef4e..8d124fbd3 100644
--- a/bpdm-common-test/pom.xml
+++ b/bpdm-common-test/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <dependencies>
diff --git a/bpdm-common/pom.xml b/bpdm-common/pom.xml
index 33f057b90..835d248f1 100644
--- a/bpdm-common/pom.xml
+++ b/bpdm-common/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <dependencies>
diff --git a/bpdm-gate-api/pom.xml b/bpdm-gate-api/pom.xml
index 479b9fbb8..a54cc2e49 100644
--- a/bpdm-gate-api/pom.xml
+++ b/bpdm-gate-api/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <artifactId>bpdm-parent</artifactId>
         <groupId>org.eclipse.tractusx</groupId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <properties>
diff --git a/bpdm-gate/pom.xml b/bpdm-gate/pom.xml
index bf03c4bf8..d735da39c 100644
--- a/bpdm-gate/pom.xml
+++ b/bpdm-gate/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <dependencies>
diff --git a/bpdm-orchestrator-api/pom.xml b/bpdm-orchestrator-api/pom.xml
index 8c0c4ea4b..b5c7c35f8 100644
--- a/bpdm-orchestrator-api/pom.xml
+++ b/bpdm-orchestrator-api/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <properties>
diff --git a/bpdm-orchestrator/pom.xml b/bpdm-orchestrator/pom.xml
index 499abc380..023f74c4d 100644
--- a/bpdm-orchestrator/pom.xml
+++ b/bpdm-orchestrator/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <dependencies>
diff --git a/bpdm-pool-api/pom.xml b/bpdm-pool-api/pom.xml
index cb9706826..4307acf6c 100644
--- a/bpdm-pool-api/pom.xml
+++ b/bpdm-pool-api/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <properties>
diff --git a/bpdm-pool/pom.xml b/bpdm-pool/pom.xml
index a6141e4c6..62cb7256c 100644
--- a/bpdm-pool/pom.xml
+++ b/bpdm-pool/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <dependencies>
diff --git a/charts/bpdm/CHANGELOG.md b/charts/bpdm/CHANGELOG.md
index 75659aac4..1847556ff 100644
--- a/charts/bpdm/CHANGELOG.md
+++ b/charts/bpdm/CHANGELOG.md
@@ -4,7 +4,7 @@ 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.1.0] -  tbd
+## [5.1.0] -  2024-07-15
 
 ### Changed
 
diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml
index dfcfb0ef5..66688277d 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: 5.1.0-SNAPSHOT
-appVersion: "6.1.0-SNAPSHOT"
+version: 5.1.0
+appVersion: "6.1.0"
 home: https://github.com/eclipse-tractusx/bpdm
 sources:
   - https://github.com/eclipse-tractusx/bpdm
@@ -33,19 +33,19 @@ maintainers:
 
 dependencies:
   - name: bpdm-gate
-    version: 6.1.0-SNAPSHOT
+    version: 6.1.0
     alias: bpdm-gate
     condition: bpdm-gate.enabled
   - name: bpdm-pool
-    version: 7.1.0-SNAPSHOT
+    version: 7.1.0
     alias: bpdm-pool
     condition: bpdm-pool.enabled
   - name: bpdm-cleaning-service-dummy
-    version: 3.1.0-SNAPSHOT
+    version: 3.1.0
     alias: bpdm-cleaning-service-dummy
     condition: bpdm-cleaning-service-dummy.enabled
   - name: bpdm-orchestrator
-    version: 3.1.0-SNAPSHOT
+    version: 3.1.0
     alias: bpdm-orchestrator
     condition: bpdm-orchestrator.enabled
   - name: bpdm-common
diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md b/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md
index eb5159be4..d75ff538c 100644
--- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md
@@ -4,7 +4,7 @@ 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/),
 
-## [3.1.0] - tbd
+## [3.1.0] - 2024-07-15
 
 ### Changed
 
diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml
index 96d0d0893..721a1efb5 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: "6.1.0-SNAPSHOT"
-version: 3.1.0-SNAPSHOT
+appVersion: "6.1.0"
+version: 3.1.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 c33844086..db76bfc9c 100644
--- a/charts/bpdm/charts/bpdm-gate/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-gate/CHANGELOG.md
@@ -4,7 +4,7 @@ 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.1.0] - tbd
+## [6.1.0] - 2024-07-15
 
 ### Changed
 
diff --git a/charts/bpdm/charts/bpdm-gate/Chart.yaml b/charts/bpdm/charts/bpdm-gate/Chart.yaml
index 9cdc48c4c..581ffc35a 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: "6.1.0-SNAPSHOT"
-version: 6.1.0-SNAPSHOT
+appVersion: "6.1.0"
+version: 6.1.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 75bf03cb4..b723b953b 100644
--- a/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md
@@ -4,7 +4,7 @@ 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/),
 
-## [3.1.0] - tbd
+## [3.1.0] - 2024-07-15
 
 ### Added
 
diff --git a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml
index fafe30afd..3d7b28e18 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: "6.1.0-SNAPSHOT"
-version: 3.1.0-SNAPSHOT
+appVersion: "6.1.0"
+version: 3.1.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 32daea7b3..9c7f77c70 100644
--- a/charts/bpdm/charts/bpdm-pool/CHANGELOG.md
+++ b/charts/bpdm/charts/bpdm-pool/CHANGELOG.md
@@ -4,7 +4,7 @@ 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/),
 
-## [7.1.0] - tbd
+## [7.1.0] - 2024-07-15
 
 ### Changed
 
diff --git a/charts/bpdm/charts/bpdm-pool/Chart.yaml b/charts/bpdm/charts/bpdm-pool/Chart.yaml
index 9eb0e23bb..be8179911 100644
--- a/charts/bpdm/charts/bpdm-pool/Chart.yaml
+++ b/charts/bpdm/charts/bpdm-pool/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-pool
-appVersion: "6.1.0-SNAPSHOT"
-version: 7.1.0-SNAPSHOT
+appVersion: "6.1.0"
+version: 7.1.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:
diff --git a/pom.xml b/pom.xml
index a0ffb1ae2..0db6c3bc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>bpdm-parent</artifactId>
     <name>Business Partner Data Management Parent</name>
     <description>Parent pom of Business Partner Data Management</description>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.1.0</version>
     <packaging>pom</packaging>
 
     <parent>