diff --git a/tasks/base_virt_ipi.yml b/tasks/base_virt_ipi.yml
index e9aaf79..ba14c3b 100644
--- a/tasks/base_virt_ipi.yml
+++ b/tasks/base_virt_ipi.yml
@@ -512,7 +512,8 @@
     - "virsh autostart ocp4-worker1"
     - "virsh autostart ocp4-worker2"
     - "virsh autostart ocp4-worker3"
-  when: bastion_defined.rc == 0
+  when:
+    ocp4_aio_deploy_type == "ipi"
 
 - name: Check if ssh-key already exists
   ansible.builtin.stat: