diff --git a/playbooks/ci_set_efi_boot_entries.yaml b/playbooks/ci_set_efi_boot_entries.yaml
index 91161ba08..cf86b4a5b 100644
--- a/playbooks/ci_set_efi_boot_entries.yaml
+++ b/playbooks/ci_set_efi_boot_entries.yaml
@@ -7,11 +7,13 @@
   hosts: cluster_machines
   gather_facts: false
   tasks:
-    - name: Define SEAPATH boot entries if needed
-      script: "../scripts/add_seapath_boot_entries.sh"
-      register: result
-      changed_when: result.rc == 2
-      failed_when: result.rc == 1
-    - name: Reboot on default slot
-      include_tasks: tasks/soft_restart_machine.yaml
-      when: result.rc == 2
+    - block:
+      - name: Define SEAPATH boot entries if needed
+        script: "../scripts/add_seapath_boot_entries.sh"
+        register: result
+        changed_when: result.rc == 2
+        failed_when: result.rc == 1
+      - name: Reboot on default slot
+        include_tasks: tasks/soft_restart_machine.yaml
+        when: result.rc == 2
+      when: create_efi_entries is defined and create_efi_entries