diff --git a/remove-node.yml b/remove-node.yml
index 7cb25ca51..341c92615 100644
--- a/remove-node.yml
+++ b/remove-node.yml
@@ -35,15 +35,14 @@
   gather_facts: no
   roles:
     - { role: kubespray-defaults }
+    - { role: bootstrap-os, tags: bootstrap-os }
     - { role: remove-node/pre-remove, tags: pre-remove }
 
-- name: Gather facts
-  import_playbook: facts.yml
-
 - hosts: "{{ node | default('kube-node') }}"
   gather_facts: no
   roles:
     - { role: kubespray-defaults }
+    - { role: bootstrap-os, tags: bootstrap-os }
     - { role: remove-node/remove-etcd-node}
     - { role: reset, tags: reset, when: reset_nodes|default(True) }
 
@@ -52,4 +51,5 @@
   gather_facts: no
   roles:
     - { role: kubespray-defaults }
+    - { role: bootstrap-os, tags: bootstrap-os}
     - { role: remove-node/post-remove, tags: post-remove }