CYB-89: Improve deb and rpm builds