Optimize script for use by CI

We will revisit developer use in [#78292980]

[#78292566]

Signed-off-by: Amit Gupta <agupta@pivotallabs.com>