Spurious key value pairs being generated into sasha value dictionaries, cauing helm get values to fail schema

In a couple of places in the templates, the input value dictionaries are being used as working copies and altered. This leads to additional key value pairs being persisted in the value dictionaries which are extracted from a live system with: helm get values
This means that these values are no longer valid if re-applied when deploying/upgrading a chart (they fail the schema).