Adjust vcpus configuration to take advantage of lizard v2

Originally created by @intrigeri on #8678 (Redmine)