Merge branch 'hot-fix-helm-scripts' into 'staging'

Fix variables to allow override of all variables with environment files

See merge request !152