Sync build environment
Merge branch '1.2' of https://github.com/FOSS-Cloud/configuration-overlay into 1.2