fix: Cleanup of birth and app publish logic [backport release-5.6.0]

fix: Cleanup of birth and app publish logic [backport release-5.6.0] #2284