Adding os-cibuild.sh settings, take 2