Adds flavors/server_types to gap analysis