updated jenkins steps and reordered fields