diff --git a/Jenkinsfile b/Jenkinsfile
index b76916e3910566d713e0e2f32087aa3349dd9dc5..95991092f5be854a2d007672dc4ba976509d57da 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -115,7 +115,7 @@ pipeline {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
                     
-                    IMAGE_TAG = generateImageTag('pom.xml')
+                    IMAGE_TAG = buildVersionName('pom.xml')
 
                     tagAndPushDockerImage('vorgang-manager', IMAGE_TAG)
                     
@@ -134,7 +134,7 @@ pipeline {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
-                    HELM_CHART_VERSION = generateHelmChartVersion("pom.xml")
+                    HELM_CHART_VERSION = buildVersionName("pom.xml")
 
                     sh "./run_helm_test.sh"
 
@@ -184,7 +184,7 @@ pipeline {
         stage ('Deploy SBOM to DependencyTrack') {
             steps {
                 script {
-                    IMAGE_TAG = generateImageTag('pom.xml')
+                    IMAGE_TAG = buildVersionName('pom.xml')
 
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
@@ -269,17 +269,22 @@ void deployHelmChart(String helmChartName, String helmChartVersion) {
     }
 }
 
-String generateHelmChartVersion(String pomFile) {
-    def chartVersion = getPomVersion(pomFile)
-
-    if (env.BRANCH_NAME == 'master') {
-        chartVersion += "-${env.GIT_COMMIT.take(7)}"
-    }
-    else if (env.BRANCH_NAME != 'release') {
-        chartVersion += "-${env.BRANCH_NAME}"
+def validateBranchName(branchName) {
+    int maxLength = 30
+    if (branchName.length() > maxLength) {
+        String originalBranchName = branchName
+        branchName = branchName.substring(0, maxLength)
+        echo "WARNING: Branch name '${originalBranchName}' exceeded ${maxLength} characters. " +
+             "It has been truncated to '${branchName}' for deployment purposes."
     }
+    return branchName
+}
 
-    return chartVersion.replaceAll("_", "-")
+String buildVersionName(String pomFile) {
+    if (isReleaseBranch()) {
+        return getPomVersion(pomFile)
+    }
+    return "${getPomVersion(pomFile)}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
 }
 
 Void tagAndPushDockerImage(String imageName, String newTag){
@@ -310,16 +315,6 @@ void updateDependencyVersions(String bescheidManagerSnapshotVersion, String vorg
     }
 }
 
-String generateImageTag(String pomFile) {
-    def imageTag = "${env.BRANCH_NAME}-${getPomVersion(pomFile)}"
-
-    if (env.BRANCH_NAME == 'master') {
-        imageTag += "-${env.GIT_COMMIT.take(7)}"
-    }
-
-    return imageTag
-}
-
 Void configureGit() {
     final email = "jenkins@ozg-sh.de"
     final name = "jenkins"
diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index 9baaa52a990f9e9b541eccd464c26a6f4f679f08..8e16170f4423747dfb389f3ebf89e288cb4f3a44 100644
--- a/bescheid-manager/pom.xml
+++ b/bescheid-manager/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<vorgang-manager.version>2.20.0-SNAPSHOT</vorgang-manager.version>
-		<nachrichten-manager.version>2.16.0-SNAPSHOT</nachrichten-manager.version>
+		<nachrichten-manager.version>2.15.0</nachrichten-manager.version>
 		<document-manager.version>1.1.0</document-manager.version>
 		<api-lib.version>0.14.0</api-lib.version>
 		<spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version>
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index 6490ff9eed3dfd3e5fc618b5eb498ccbed5733c8..8912a75cf5c3ef6f80885f9f2c84a905dc1fc7c6 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -55,7 +55,7 @@
 		<user-manager-interface.version>2.12.0</user-manager-interface.version>
 		<bescheid-manager.version>1.23.0-SNAPSHOT</bescheid-manager.version>
 		<processor-manager.version>0.5.0</processor-manager.version>
-		<nachrichten-manager.version>2.16.0-SNAPSHOT</nachrichten-manager.version>
+		<nachrichten-manager.version>2.15.0</nachrichten-manager.version>
 		<api-lib.version>0.15.0</api-lib.version>
 		<notification-manager.version>2.14.0-SNAPSHOT</notification-manager.version>
 		<collaboration-manager.version>0.7.0-PR-22-SNAPSHOT</collaboration-manager.version>
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
index edbba916258e4cb2e4b005534b93a15559291d9a..c09938f11e6ae55f3552995e760a2b43b0d541bd 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
@@ -348,7 +348,9 @@ class CollaborationITCase {
 
 				waitUntilCommandHasStatus(command.getId(), CommandStatus.ERROR);
 
-				await().atMost(70, TimeUnit.SECONDS).untilAsserted(() -> assertThat(loadCollaborationRequest(vorgangId)).isEmpty());
+				await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> {
+					assertThat(loadCollaborationRequest(vorgangId)).isEmpty();
+				});
 			}
 		}