Merge "Fix: Add HELM credentials to oom-settings"