Fix Docker image name parsing

Fixes #8357
Merge pull request #8363 from greenmoss/devel

Fix Docker image name parsing