Fix ImageId check creation and tagging for EC2.