diff --git a/tools/image-tag b/tools/image-tag
index cfa0aae7690dba71842248f80921e71951603171..406b0740e0d734f5c5d8ebaaddc4666b356d90ad 100755
--- a/tools/image-tag
+++ b/tools/image-tag
@@ -5,7 +5,9 @@ set -o nounset
 set -o pipefail
 
 WIP=$(git diff --quiet || echo '-WIP')
-BRANCH=$(git rev-parse --abbrev-ref HEAD | sed s#/#-#g)
+BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's#/#-#g')
+# When 7 chars are not enough to be unique, git automatically uses more.
+# We are forcing to 7 here, as we are doing for grafana/grafana as well.
 SHA=$(git rev-parse --short=7 HEAD | head -c7)
 
 # If this is a tag, use it,                      otherwise branch-hash