Merge "[Portal] Fix Ingress configuration"