WIP: more changes to CI setup