Pulling in Johannes's Rosbuild support