diff --git a/sbin/tag_and_push_docker_image.sh b/sbin/tag_and_push_docker_image.sh
index 7d70a6645154d1509ef9ee4b7eed8e9ab7212337..44605c52c7eed433cf89d0fab66d51946ce305cd 100755
--- a/sbin/tag_and_push_docker_image.sh
+++ b/sbin/tag_and_push_docker_image.sh
@@ -167,7 +167,7 @@ if [ ! -z "${1+x}" ] && [ "${1}" != "pull" ]; then
       fi
 
       make build "${1}"
-      docker tag "${2}" "${local_url}:${tag}"
+      docker tag "${2}" "${local_url}:${tag}" || docker tag "${2/_/-}" "${local_url}:${tag}"
       docker push "${local_url}:${tag}"
     fi
   done