As part of the effort discover all needed changes required by the CI move, we should aim to keep CI PoC green and always rebased on master the more changes we move.