fix: Attempt to fix manifest race conditions.

fix: Attempt to fix manifest race conditions. #653