[FORGE-2172] Updated Roaster