diff --git a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle b/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
index 0dba0c0..852423b 100644
--- a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
+++ b/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
@@ -63,7 +63,12 @@ scmVersion {
     tag {
         def shortened = project.name.startsWith(project.group + ".") ?
             project.name.substring(project.group.length() + 1) : project.name
-        prefix = shortened.replace('.', '-') + "-"
+        var p = shortened.replace('.', '-') + "-"
+        if (grgit.branch.current.name != "main"
+            && !grgit.branch.current.name.startsWith("release")) {
+            p = p + grgit.branch.current.name.replace('/', '-') + "-"
+        }
+        prefix = p
     }
 }
 version = scmVersion.version