Merge "Remove credentials from charts"