diff --git a/ci-scripts/container_build.sh b/ci-scripts/container_build.sh
index ca86aa653..b22287a52 100755
--- a/ci-scripts/container_build.sh
+++ b/ci-scripts/container_build.sh
@@ -64,7 +64,8 @@ log "==================== BEGIN ===================="
 # Trace all commands
 set -o xtrace
 
-
+# Avoid illegal chars in tag name
+TAG=$(echo $TAG | tr '/' '_')
 
 [[ -z "${PUSH_IMAGES:-}" ]] && PUSH_IMAGES="no"
 [[ -z "${TAG_COMMIT:-}" ]] && TAG_COMMIT="yes"