During the refactor of _register_image to support ENA networking, the exception handling wasn't properly addressed as boto3 passes along the ClientError from botocore and the decorator is expecting EC2ResponseError which doesn't trigger the auto-incrementing name behavior.
The proposed change is to change the registration_retry decorator to use the ClientError vs EC2ResponseError.
Admittedly, this is not a common case, but we do see it typically due to (misconfigured) parallel bake pipelines.