bring kiwi setup in sync with OBS code