diff --git a/vars/kubecontainer.groovy b/vars/kubecontainer.groovy
index 3277851..53a9326 100644
--- a/vars/kubecontainer.groovy
+++ b/vars/kubecontainer.groovy
@@ -47,7 +47,7 @@ String buildAndPublishImage(Map options = [:]) {
         stage("Build image '${imageName}:${imageTag}'") {
             git.withHTTPCredentials(gitCredentialsId) {
                 sh """
-                CURRENT_BRANCH=${BRANCH_NAME} make 
+                CURRENT_BRANCH=$( echo ${BRANCH_NAME} | | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]') make 
                 """
             }
         }
@@ -62,7 +62,7 @@ String buildAndPublishImage(Map options = [:]) {
             utils.when(!dryRun) {
                 retry(2) {
                     sh """
-                	CURRENT_BRANCH=${BRANCH_NAME} make release 
+                	CURRENT_BRANCH=$( echo ${BRANCH_NAME} | | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]') make 
                     """
                 }
             }