Revert "Revert "Build: Fix repack process""

This reverts commit 801ff4ad83b5d10c1bbadcb21ffba049e257dbaf.