Fix image tagging on new Docker versions