Updated, needs squashed
Give --override-update-channel as an optional argument
Make the changes only in ondemand_update job, needs squashed