Fix packaging for aarch64 and x86_64