OZP-492 (cont) Fixed Metrics build process