build: Update and cleanup

Edited by Gaël Bonithon

Merge request reports