diff --git a/roles/kubespray-defaults/tasks/main.yaml b/roles/kubespray-defaults/tasks/main.yaml
index ebd9b896be0..27172d89b62 100644
--- a/roles/kubespray-defaults/tasks/main.yaml
+++ b/roles/kubespray-defaults/tasks/main.yaml
@@ -9,15 +9,18 @@
 - name: Set fallback_ips
   import_tasks: fallback_ips.yml
   when:
-    - "'bootstrap-os' not in ansible_play_role_names"
+    - "'bootstrap-os' not in ansible_play_role_names or
+      ansible_collection_name + '.bootstrap-os' not in ansible_play_role_names"
     - fallback_ips is not defined
   tags:
     - always
 
+
 - name: Set no_proxy
   import_tasks: no_proxy.yml
   when:
-    - "'bootstrap-os' not in ansible_play_role_names"
+    - "'bootstrap-os' not in ansible_play_role_names or
+      ansible_collection_name + '.bootstrap-os' not in ansible_play_role_names"
     - http_proxy is defined or https_proxy is defined
     - no_proxy is not defined
   tags: