diff --git a/.gitlab/deployment_scripts/cleanup_tags_non_revision.sh b/.gitlab/deployment_scripts/cleanup_tags_non_revision.sh
index 85a9f400e58d01d0b5680250cd9df0badc59429a..f4808372b07b047c9e499e267eb79256572965df 100755
--- a/.gitlab/deployment_scripts/cleanup_tags_non_revision.sh
+++ b/.gitlab/deployment_scripts/cleanup_tags_non_revision.sh
@@ -3,7 +3,7 @@
 set -e
 
 HELM_RELEASE_NAME=${HELM_RELEASE_NAME:0:53}
-HELM_RELEASE_NAME=${HELM_RELEASE_NAME%%*(-)}
+HELM_RELEASE_NAME=$(echo $HELM_RELEASE_NAME | sed 's/-$//')
 
 # Get All existing tags for the fpm repo
 echo "Fetching existing fpm tags..."
diff --git a/.gitlab/deployment_scripts/cleanup_tags_revision.sh b/.gitlab/deployment_scripts/cleanup_tags_revision.sh
index c16936e14c90041cea5223377cf0598f16e3c111..51cdc27129c297691bd5d3af2df22a126eb04a42 100755
--- a/.gitlab/deployment_scripts/cleanup_tags_revision.sh
+++ b/.gitlab/deployment_scripts/cleanup_tags_revision.sh
@@ -3,7 +3,7 @@
 # Call script with KEEP_N variable set to specify the amount of releases to keep
 
 HELM_RELEASE_NAME=${HELM_RELEASE_NAME:0:53}
-HELM_RELEASE_NAME=${HELM_RELEASE_NAME%%*(-)}
+HELM_RELEASE_NAME=$(echo $HELM_RELEASE_NAME | sed 's/-$//')
 
 helm -n $KUBE_NAMESPACE history ${HELM_RELEASE_NAME}
 if [ $? -ne 0 ]
diff --git a/.gitlab/deployment_scripts/delete_deployment.sh b/.gitlab/deployment_scripts/delete_deployment.sh
index 50f4fdcabadc3ed21a1c07de79017a4b752a2dd6..7fd1544bfb222ef28f426c91fc798dc91191e5f3 100755
--- a/.gitlab/deployment_scripts/delete_deployment.sh
+++ b/.gitlab/deployment_scripts/delete_deployment.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 HELM_RELEASE_NAME=${HELM_RELEASE_NAME:0:53}
-HELM_RELEASE_NAME=${HELM_RELEASE_NAME%%*(-)}
+HELM_RELEASE_NAME=$(echo $HELM_RELEASE_NAME | sed 's/-$//')
 
 echo "Removing Image Tags..."
 .gitlab/deployment_scripts/cleanup_tags_revision.sh
diff --git a/.gitlab/deployment_scripts/update_deployment.sh b/.gitlab/deployment_scripts/update_deployment.sh
index ed2e7ea0db842c351d8468dc7035e40bbd0af917..c49f097d23df83904f40176c182743424ee58ce7 100755
--- a/.gitlab/deployment_scripts/update_deployment.sh
+++ b/.gitlab/deployment_scripts/update_deployment.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 HELM_RELEASE_NAME=${HELM_RELEASE_NAME:0:53}
-HELM_RELEASE_NAME=${HELM_RELEASE_NAME%%*(-)}
+HELM_RELEASE_NAME=$(echo $HELM_RELEASE_NAME | sed 's/-$//')
 
 helm -n $KUBE_NAMESPACE upgrade --install \
     ${HELM_RELEASE_NAME} \