Merge "[OOF] Fix Ingress configuration"