diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index f5d5237406..c0c6e8f082 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -1,13 +1,13 @@
-# TODO(kozhukalov): Remove this once the below PR is merged
-# https://review.opendev.org/c/openstack/openstack-helm-infra/+/884989
 - nodeset:
     name: openstack-helm-single-32GB-focal-tmp
     nodes:
       - name: primary
-        # this label is available in vexxhost with
-        # v3-standard-8 flavor which is 8 cpus and 32GB memory
-        # the same flavor is used for ubuntu-bionic-32GB
-        label: nested-virt-ubuntu-focal
+        # This label is available in vexxhost ca-ymq-1 region
+        # The flavor v3-standard-8 in this particular region has
+        # 32GB nodes. We should not stick to this label because
+        # the number of such nodes is extremely limited.
+        # We'd better switch to multinode nodesets ASAP (in-progress).
+        label: ubuntu-focal-32GB
     groups:
       - name: primary
         nodes: