Merge "[UUI] Fix Ingress configuration"