Merge "SO helm chart cleanup"