diff --git a/roles/nsxt/nsxt-transport-nodes/tasks/main.yml b/roles/nsxt/nsxt-transport-nodes/tasks/main.yml
index ce376bf..bab49b4 100644
--- a/roles/nsxt/nsxt-transport-nodes/tasks/main.yml
+++ b/roles/nsxt/nsxt-transport-nodes/tasks/main.yml
@@ -46,9 +46,10 @@
   delay: 10
   until:
     - host_transport_node_facts.results
-    - host_transport_node_facts | community.general.json_query(host_node_query)
+    - managed_by_server.0 == nested_vcenter.ip
   vars:
     host_node_query: "results[?node_deployment_info.resource_type=='HostNode'].node_deployment_info.managed_by_server"
+    managed_by_server: "{{ host_transport_node_facts | community.general.json_query(host_node_query) }}"
 
 - ansible.builtin.debug: msg="Creating edge nodes {{ nsxt.edge_nodes }}"