fix: Cleanup of birth and app publish logic

fix: Cleanup of birth and app publish logic #4975