diff --git a/Jenkinsfile b/Jenkinsfile
index b84fa5f53e22bafb34d7fd448aa61118db721af9..95991092f5be854a2d007672dc4ba976509d57da 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -269,11 +269,22 @@ void deployHelmChart(String helmChartName, String helmChartVersion) {
     }
 }
 
+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
+}
+
 String buildVersionName(String pomFile) {
     if (isReleaseBranch()) {
         return getPomVersion(pomFile)
     }
-    return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
+    return "${getPomVersion(pomFile)}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
 }
 
 Void tagAndPushDockerImage(String imageName, String newTag){