diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
index 8874da2d3..6f01211e8 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
@@ -95,8 +95,8 @@
   when: skip_install is not defined
 - name: "Install ironic-inspector to permit use of inspection interface"
   include: inspector_install.yml
-  when: enable_inspector | bool == true
+  when: skip_install is not defined and enable_inspector | bool == true
 - name: "Install ironic-staging-drivers"
   include: staging_install.yml
-  when: staging_drivers_include | bool == true
+  when: skip_install is not defined and staging_drivers_include | bool == true