Merge "converting config to helm and setting demo values"