Merge "Update config of policy/distribution chart"