(WIP)Fix automation issues due to cli change