Merge "[CLI] Fix Ingress configuration"