Fix metadata for customer as well