[release-1.31] fix: vm-type is not overriding as expected

[release-1.31] fix: vm-type is not overriding as expected #6007