Merge main and master branch

There's a main branch as well, with some changes that are not in master See https://0xacab.org/leap/container-platform/float-runner/-/tree/main?ref_type=heads

We need to merge both, and set main as the default and protected.