LPS-31315 Regenerate remaining services