For cleaner CICD script. Note that we can't use outputs defined in our own step, so also change to shell vars intead. For #1474
For cleaner CICD script. Note that we can't use outputs defined in our own step, so also change to shell vars intead. For #1474