updatecli
diff --git a/pkg/plugins/scms/bitbucket/main.go b/pkg/plugins/scms/bitbucket/main.go
@@ -101,6 +101,31 @@ type Spec struct {
 	//    The working branch created by Updatecli looks like "updatecli_<pipelineID>".
 	//    The working branch can be disabled using the "workingBranch" parameter set to false.
 	Branch string `yaml:",omitempty"`
+	// WorkingBranchPrefix defines the prefix used to create a working branch.
+	//
+	// compatible:
+	//   * scm
+	//
+	// default:
+	//   updatecli
+	//
+	// remark:
+	//   A working branch is composed of three components:
+	//   1. WorkingBranchPrefix
+	//   2. Target Branch
+	//   3. PipelineID
+	//
+	//   If WorkingBranchPrefix is set to '', then
+	//   the working branch will look like "<branch>_<pipelineID>".
+	WorkingBranchPrefix *string `yaml:",omitempty"`
+	// WorkingBranchSeparator defines the separator used to create a working branch.
+	//
+	// compatible:
+	//   * scm
+	//
+	// default:
+	//   "_"
+	WorkingBranchSeparator *string `yaml:",omitempty"`
 	//  "submodules" defines if Updatecli should checkout submodules.
 	//
 	//  compatible:
@@ -123,11 +148,13 @@ type Bitbucket struct {
 	// Spec contains inputs coming from updatecli configuration
 	Spec Spec
 	// client handle the api authentication
-	client           *scm.Client
-	pipelineID       string
-	nativeGitHandler gitgeneric.GitHandler
-	workingBranch    bool
-	force            bool
+	client                 *scm.Client
+	pipelineID             string
+	nativeGitHandler       gitgeneric.GitHandler
+	workingBranch          bool
+	workingBranchPrefix    string
+	workingBranchSeparator string
+	force                  bool
 }
 
 // New returns a new valid Bitbucket Cloud object.
@@ -163,6 +190,16 @@ func New(spec interface{}, pipelineID string) (*Bitbucket, error) {
 		s.Branch = "main"
 	}
 
+	workingBranchhPrefix := "updatecli"
+	if s.WorkingBranchPrefix != nil {
+		workingBranchhPrefix = *s.WorkingBranchPrefix
+	}
+
+	workingBranchSeparator := "_"
+	if s.WorkingBranchSeparator != nil {
+		workingBranchSeparator = *s.WorkingBranchSeparator
+	}
+
 	workingBranch := true
 	if s.WorkingBranch != nil {
 		workingBranch = *s.WorkingBranch
@@ -200,12 +237,14 @@ If you know what you are doing, please set the force option to true in your conf
 
 	nativeGitHandler := gitgeneric.GoGit{}
 	g := Bitbucket{
-		Spec:             s,
-		client:           c,
-		pipelineID:       pipelineID,
-		nativeGitHandler: &nativeGitHandler,
-		workingBranch:    workingBranch,
-		force:            force,
+		Spec:                   s,
+		client:                 c,
+		pipelineID:             pipelineID,
+		nativeGitHandler:       &nativeGitHandler,
+		workingBranch:          workingBranch,
+		workingBranchPrefix:    workingBranchhPrefix,
+		workingBranchSeparator: workingBranchSeparator,
+		force:                  force,
 	}
 
 	g.setDirectory()

diff --git a/pkg/plugins/scms/bitbucket/scm.go b/pkg/plugins/scms/bitbucket/scm.go
@@ -3,6 +3,7 @@ package bitbucket
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 	"github.com/updatecli/updatecli/pkg/plugins/resources/bitbucket/client"
@@ -14,7 +15,8 @@ func (b *Bitbucket) GetBranches() (sourceBranch, workingBranch, targetBranch str
 	targetBranch = b.Spec.Branch
 
 	if len(b.pipelineID) > 0 && b.workingBranch {
-		workingBranch = b.nativeGitHandler.SanitizeBranchName(fmt.Sprintf("updatecli_%s_%s", targetBranch, b.pipelineID))
+		workingBranch = b.nativeGitHandler.SanitizeBranchName(
+			strings.Join([]string{b.workingBranchPrefix, targetBranch, b.pipelineID}, b.workingBranchSeparator))
 	}
 
 	return sourceBranch, workingBranch, targetBranch

diff --git a/pkg/plugins/scms/git/main.go b/pkg/plugins/scms/git/main.go
@@ -59,6 +59,31 @@ type Spec struct {
 	// 		For more information, please refer to the following issue:
 	// 		https://github.com/updatecli/updatecli/issues/1139
 	Branch string `yaml:",omitempty"`
+	// WorkingBranchPrefix defines the prefix used to create a working branch.
+	//
+	// compatible:
+	//   * scm
+	//
+	// default:
+	//   updatecli
+	//
+	// remark:
+	//   A working branch is composed of three components:
+	//   1. WorkingBranchPrefix
+	//   2. Target Branch
+	//   3. PipelineID
+	//
+	//   If WorkingBranchPrefix is set to '', then
+	//   the working branch will look like "<branch>_<pipelineID>".
+	WorkingBranchPrefix *string `yaml:",omitempty"`
+	// WorkingBranchSeparator defines the separator used to create a working branch.
+	//
+	// compatible:
+	//   * scm
+	//
+	// default:
+	//   "_"
+	WorkingBranchSeparator *string `yaml:",omitempty"`
 	//	"user" specifies the user associated with new git commit messages created by Updatecli
 	//
 	//	compatible:
@@ -136,8 +161,10 @@ type Git struct {
 	// nativeGitHandler is the native git handler
 	nativeGitHandler gitgeneric.GitHandler
 	// workingBranch is used to create a temporary branch to work on.
-	workingBranch bool
-	pipelineID    string
+	workingBranch          bool
+	workingBranchPrefix    string
+	workingBranchSeparator string
+	pipelineID             string
 }
 
 // New returns a new git object
@@ -154,6 +181,16 @@ func New(s Spec, pipelineID string) (*Git, error) {
 		s.Branch = "main"
 	}
 
+	workingBranchPrefix := "updatecli"
+	if s.WorkingBranchPrefix != nil {
+		workingBranchPrefix = *s.WorkingBranchPrefix
+	}
+
+	workingBranchSeparator := "_"
+	if s.WorkingBranchSeparator != nil {
+		workingBranchSeparator = *s.WorkingBranchSeparator
+	}
+
 	var workingBranch bool
 	switch s.WorkingBranch {
 	case nil:
@@ -181,10 +218,12 @@ If you know what you are doing, please set the workingBranch option to false in
 	nativeGitHandler := gitgeneric.GoGit{}
 
 	return &Git{
-		spec:             s,
-		nativeGitHandler: &nativeGitHandler,
-		workingBranch:    workingBranch,
-		pipelineID:       pipelineID,
+		spec:                   s,
+		nativeGitHandler:       &nativeGitHandler,
+		workingBranch:          workingBranch,
+		workingBranchPrefix:    workingBranchPrefix,
+		workingBranchSeparator: workingBranchSeparator,
+		pipelineID:             pipelineID,
 	}, nil
 }
 

diff --git a/pkg/plugins/scms/git/scm.go b/pkg/plugins/scms/git/scm.go
@@ -1,8 +1,8 @@
 package git
 
 import (
-	"fmt"
 	"os"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 )
@@ -13,7 +13,8 @@ func (g *Git) GetBranches() (sourceBranch, workingBranch, targetBranch string) {
 	targetBranch = g.spec.Branch
 
 	if g.workingBranch && len(g.pipelineID) > 0 {
-		workingBranch = g.nativeGitHandler.SanitizeBranchName(fmt.Sprintf("updatecli_%s_%s", targetBranch, g.pipelineID))
+		workingBranch = g.nativeGitHandler.SanitizeBranchName(
+			strings.Join([]string{g.workingBranchPrefix, targetBranch, g.pipelineID}, g.workingBranchSeparator))
 	}
 
 	return sourceBranch, workingBranch, targetBranch

diff --git a/pkg/plugins/scms/gitea/main.go b/pkg/plugins/scms/gitea/main.go
@@ -101,6 +101,31 @@ type Spec struct {
 	//    The working branch created by Updatecli looks like "updatecli_<pipelineID>".
 	// 	  The working branch can be disabled using the "workingBranch" parameter set to false.
 	Branch string `yaml:",omitempty"`
+	// WorkingBranchPrefix defines the prefix used to create a working branch.
+	//
+	// compatible:
+	//   * scm
+	//
+	// default:
+	//   updatecli
+	//
+	// remark:
+	//   A working branch is composed of three components:
+	//   1. WorkingBranchPrefix
+	//   2. Target Branch
+	//   3. PipelineID
+	//
+	//   If WorkingBranchPrefix is set to '', then
+	//   the working branch will look like "<branch>_<pipelineID>".
+	WorkingBranchPrefix *string `yaml:",omitempty"`
+	// WorkingBranchSeparator defines the separator used to create a working branch.
+	//
+	// compatible:
+	//   * scm
+	//
+	// default:
+	//   "_"
+	WorkingBranchSeparator *string `yaml:",omitempty"`
 	//  "submodules" defines if Updatecli should checkout submodules.
 	//
 	//  compatible:
@@ -123,11 +148,13 @@ type Gitea struct {
 	// Spec contains inputs coming from updatecli configuration
 	Spec Spec
 	// client handle the api authentication
-	client           client.Client
-	nativeGitHandler gitgeneric.GitHandler
-	pipelineID       string
-	workingBranch    bool
-	force            bool
+	client                 client.Client
+	nativeGitHandler       gitgeneric.GitHandler
+	pipelineID             string
+	workingBranch          bool
+	workingBranchPrefix    string
+	workingBranchSeparator string
+	force                  bool
 }
 
 // New returns a new valid Gitea object.
@@ -177,6 +204,16 @@ func New(spec interface{}, pipelineID string) (*Gitea, error) {
 		workingBranch = *s.WorkingBranch
 	}
 
+	workingBranchPrefix := "updatecli"
+	if s.WorkingBranchPrefix != nil {
+		workingBranchPrefix = *s.WorkingBranchPrefix
+	}
+
+	workingBranchSeparator := "_"
+	if s.WorkingBranchSeparator != nil {
+		workingBranchSeparator = *s.WorkingBranchSeparator
+	}
+
 	force := true
 	if s.Force != nil {
 		force = *s.Force
@@ -215,12 +252,14 @@ If you know what you are doing, please set the force option to true in your conf
 
 	nativeGitHandler := gitgeneric.GoGit{}
 	g := Gitea{
-		Spec:             s,
-		client:           c,
-		pipelineID:       pipelineID,
-		nativeGitHandler: &nativeGitHandler,
-		workingBranch:    workingBranch,
-		force:            force,
+		Spec:                   s,
+		client:                 c,
+		pipelineID:             pipelineID,
+		nativeGitHandler:       &nativeGitHandler,
+		workingBranch:          workingBranch,
+		workingBranchPrefix:    workingBranchPrefix,
+		workingBranchSeparator: workingBranchSeparator,
+		force:                  force,
 	}
 
 	g.setDirectory()

diff --git a/pkg/plugins/scms/gitea/scm.go b/pkg/plugins/scms/gitea/scm.go
@@ -3,6 +3,7 @@ package gitea
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/sirupsen/logrus"
 )
@@ -14,7 +15,8 @@ func (g *Gitea) GetBranches() (sourceBranch, workingBranch, targetBranch string)
 	targetBranch = g.Spec.Branch
 
 	if len(g.pipelineID) > 0 && g.workingBranch {
-		workingBranch = g.nativeGitHandler.SanitizeBranchName(fmt.Sprintf("updatecli_%s_%s", targetBranch, g.pipelineID))
+		workingBranch = g.nativeGitHandler.SanitizeBranchName(
+			strings.Join([]string{g.workingBranchPrefix, targetBranch, g.pipelineID}, g.workingBranchSeparator))
 	}
 
 	return sourceBranch, workingBranch, targetBranch