Omit tag from parsed image name

Fixes #8925