diff --git a/roles/network_plugin/multus/tasks/main.yml b/roles/network_plugin/multus/tasks/main.yml
index 3b0819d81..0113c399e 100644
--- a/roles/network_plugin/multus/tasks/main.yml
+++ b/roles/network_plugin/multus/tasks/main.yml
@@ -27,8 +27,8 @@
     - {name: multus-daemonset-crio, file: multus-daemonset-crio.yml, type: daemonset, engine: crio }
   register: multus_manifest_2
   vars:
-    host_query: "*|[?container_manager=='{{ container_manager }}']|[0].inventory_hostname"
-    vars_from_node: "{{ hostvars | json_query(host_query) }}"
+    host_query: "[?container_manager=='{{ container_manager }}']|[0].inventory_hostname"
+    vars_from_node: "{{ ansible_play_hosts_all | map('extract', hostvars) | list | json_query(host_query) }}"
   delegate_to: "{{ groups['kube_control_plane'][0] }}"
   when:
     - item.engine in container_manager_types