Support helm-based blueprint services + small refactor