Fixes #8222 - Prevent duplicate docker tags for repos