diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 115260f68..01e23e801 100644
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -54,7 +54,7 @@
   include: scenarios/lvm.yml
   when:
     - osd_scenario == 'lvm'
-    - lvm_volumes is defined
+    - lvm_volumes|length > 0
     - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
@@ -63,7 +63,7 @@
   include: scenarios/lvm-batch.yml
   when:
     - osd_scenario == 'lvm'
-    - devices is defined
+    - devices|length > 0
     - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False