KOTA-120: Improved the build for different environments