diff --git a/ceph/osd/setup.sls b/ceph/osd/setup.sls
index 852bfe5..5b1a832 100644
--- a/ceph/osd/setup.sls
+++ b/ceph/osd/setup.sls
@@ -176,7 +176,7 @@
 reload_partition_table_{{ dev_device }}:
   cmd.run:
   - name: "partprobe"
-  - unless: "lsblk -p | grep {{ dev_device }} -A1 | grep -v lockbox | grep ceph | grep osd"
+  - unless: "lsblk -p | grep {{ dev_device }} -A1 | grep -v lockbox | grep {{ dev_device }} | grep ceph | grep osd"
   - require:
     - cmd: prepare_disk_{{ dev_device }}
     - cmd: zap_disk_{{ dev_device }}
@@ -195,7 +195,7 @@
 {%- else %}
   - name: "ceph-disk activate --activate-key /etc/ceph/{{ common.get('cluster_name', 'ceph') }}.client.bootstrap-osd.keyring {{ dev_device }}"
 {%- endif %}
-  - unless: "lsblk -p | grep {{ dev_device }} -A1 | grep -v lockbox | grep ceph | grep osd"
+  - unless: "lsblk -p | grep {{ dev_device }} -A1 | grep -v lockbox | grep {{ dev_device }} | grep ceph | grep osd"
   - require:
     - cmd: prepare_disk_{{ dev_device }}
     - cmd: zap_disk_{{ dev_device }}