fix(ci): rollback fixes, minor updates