diff --git a/ceph/osd/setup.sls b/ceph/osd/setup.sls
index e028575..8c2bc56 100644
--- a/ceph/osd/setup.sls
+++ b/ceph/osd/setup.sls
@@ -1,7 +1,7 @@
 {%- from "ceph/map.jinja" import osd, common with context %}
 
 include:
-{%- if osd.zap_disks is defined and osd.zap_disks == true %}
+{%- if osd.backend.bluestore.create_partitions is defined and osd.backend.bluestore.create_partitions == true %}
 - ceph.osd.setup.partitioning
 {%- endif %}
 {%- if osd.lvm_enabled is defined and osd.lvm_enabled == true %}
diff --git a/ceph/osd/setup/lvm.sls b/ceph/osd/setup/lvm.sls
index 77c5db8..e5e737c 100644
--- a/ceph/osd/setup/lvm.sls
+++ b/ceph/osd/setup/lvm.sls
@@ -43,6 +43,11 @@
 {%- do cmd.append('--data ') %}
 {%- do cmd.append(dev) %}
 
+link_keyring:
+  cmd.run:
+    - name: "ln -s {{"/etc/ceph/" + common.get('cluster_name', 'ceph') + ".client.bootstrap-osd.keyring"}} /var/lib/ceph/bootstrap-osd/ceph.keyring"
+    - unless: "ls /var/lib/ceph/bootstrap-osd/ceph.keyring"
+
 prepare_disk_{{ dev }}:
   cmd.run:
   - name: "yes | ceph-volume lvm prepare {{ cmd|join(' ') }}"