diff --git a/.github/scripts/docker_helpers.sh b/.github/scripts/docker_helpers.sh
index c4ca28f8e7..5a77026dd2 100755
--- a/.github/scripts/docker_helpers.sh
+++ b/.github/scripts/docker_helpers.sh
@@ -20,21 +20,20 @@ export SHORT_SHA=$(get_short_sha)
 echo "SHORT_SHA: $SHORT_SHA"
 
 function get_tag {
-    echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG},g" -e 's,refs/tags/,,g' -e 's,refs/heads/,,g' -e 's,refs/heads/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1,g' -e 's,/,-,g')
+    echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG},g" -e 's,refs/tags/,,g' -e 's,refs/heads/,,g' -e 's,refs/pull/\([0-9]*\).*,pr\1,g'  -e 's,/,-,g')
 }
 
 function get_tag_slim {
-    echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-slim,g" -e 's,refs/tags/\(.*\),\1-slim,g' -e 's,refs/heads/\(.*\),\1-slim,g' -e 's,refs/heads/\(.*\),\1-slim,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g' -e 's,/,-,g')
+    echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-slim,g" -e 's,refs/tags/\(.*\),\1-slim,g' -e 's,refs/heads/\(.*\),\1-slim,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-slim,g'  -e 's,/,-,g')
 }
 
 function get_tag_full {
-    echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-full,g" -e 's,refs/tags/\(.*\),\1-full,g' -e 's,refs/heads/\(.*\),\1-full,g' -e 's,refs/heads/\(.*\),\1-full,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g' -e 's,/,-,g')
+    echo $(echo ${REF} | sed -e "s,refs/heads/${MAIN_BRANCH},${MAIN_BRANCH_TAG}-full,g" -e 's,refs/tags/\(.*\),\1-full,g' -e 's,refs/heads/\(.*\),\1-full,g' -e 's,refs/pull/\([0-9]*\).*,pr\1-full,g'  -e 's,/,-,g')
 }
 
 function get_python_docker_release_v() {
     echo "$(echo "${REF}" | \
         sed -e "s,refs/heads/${MAIN_BRANCH},1\!0.0.0+docker.${SHORT_SHA},g" \
-            -e 's,refs/heads/\(.*\),1!0.0.0+docker.\1,g' \
             -e 's,refs/heads/\(.*\),1!0.0.0+docker.\1,g' \
             -e 's,refs/tags/v\([0-9a-zA-Z.]*\).*,\1+docker,g' \
             -e 's,refs/pull/\([0-9]*\).*,1!0.0.0+docker.pr\1,g' \
@@ -50,21 +49,21 @@ if [ ${TEST_DOCKER_HELPERS:-0} -eq 1 ]; then
     REF="refs/heads/branch-name"   get_python_docker_release_v # '1!0.0.0+docker.branch-name'
     REF="refs/heads/releases/branch-name" get_python_docker_release_v # 1!0.0.0+docker.releases-branch-name'
 
-    GITHUB_REF="refs/tags/v0.1.2rc1"    get_tag # '0.1.2rc1'
-    GITHUB_REF="refs/tags/v0.1.2rc1"    get_tag_slim # '0.1.2rc1-slim'
-    GITHUB_REF="refs/tags/v0.1.2rc1"    get_tag_full # '0.1.2rc1-full'
+    REF="refs/tags/v0.1.2rc1"    get_tag # 'v0.1.2rc1'
+    REF="refs/tags/v0.1.2rc1"    get_tag_slim # 'v0.1.2rc1-slim'
+    REF="refs/tags/v0.1.2rc1"    get_tag_full # 'v0.1.2rc1-full'
 
-    GITHUB_REF="refs/pull/4788/merge"    get_tag # 'pr4788'
-    GITHUB_REF="refs/pull/4788/merge"    get_tag_slim # 'pr4788-slim'
-    GITHUB_REF="refs/pull/4788/merge"    get_tag_full # 'pr4788-full'
+    REF="refs/pull/4788/merge"    get_tag # 'pr4788'
+    REF="refs/pull/4788/merge"    get_tag_slim # 'pr4788-slim'
+    REF="refs/pull/4788/merge"    get_tag_full # 'pr4788-full'
 
-    GITHUB_REF="refs/heads/branch-name" get_tag # 'branch-name'
-    GITHUB_REF="refs/heads/branch-name" get_tag_slim # 'branch-name-slim'
-    GITHUB_REF="refs/heads/branch-name" get_tag_full # 'branch-name-full'
+    REF="refs/heads/branch-name" get_tag # 'branch-name'
+    REF="refs/heads/branch-name" get_tag_slim # 'branch-name-slim'
+    REF="refs/heads/branch-name" get_tag_full # 'branch-name-full'
 
-    GITHUB_REF="refs/heads/releases/branch-name" get_tag # 'releases-branch-name'
-    GITHUB_REF="refs/heads/releases/branch-name" get_tag_slim # 'releases-branch-name-slim'
-    GITHUB_REF="refs/heads/releases/branch-name" get_tag_full # 'releases-branch-name-full'
+    REF="refs/heads/releases/branch-name" get_tag # 'releases-branch-name'
+    REF="refs/heads/releases/branch-name" get_tag_slim # 'releases-branch-name-slim'
+    REF="refs/heads/releases/branch-name" get_tag_full # 'releases-branch-name-full'
 fi
 
 function get_unique_tag {