Merge "Remove hardcoded values from values.yaml"