Revert "Revert Build: Fix repack process"

Revert "Revert Build: Fix repack process"