Fix discovery compatibility, add proper label in Deployment setting