diff --git a/README.rst b/README.rst
index 9312c48..c368704 100644
--- a/README.rst
+++ b/README.rst
@@ -291,7 +291,6 @@
           ....
       osd:
         enabled: true
-        ceph_host_id: '39'
         crush_parent: rack01
         journal_size: 20480                     (20G)
         bluestore_block_db_size: 10073741824    (10G)
diff --git a/metadata/service/common/cluster.yml b/metadata/service/common/cluster.yml
index 2358610..2ac66f4 100644
--- a/metadata/service/common/cluster.yml
+++ b/metadata/service/common/cluster.yml
@@ -15,3 +15,7 @@
           host: ${_param:ceph_mon_node02_address}
         - name: ${_param:ceph_mon_node03_hostname}
           host: ${_param:ceph_mon_node03_address}
+      keyring:
+        bootstrap-osd:
+          caps:
+            mon: "allow profile bootstrap-osd"
diff --git a/metadata/service/common/single.yml b/metadata/service/common/single.yml
index 91a783b..68ac50b 100644
--- a/metadata/service/common/single.yml
+++ b/metadata/service/common/single.yml
@@ -9,3 +9,7 @@
       members:
         - name: ${_param:ceph_mon_node01_hostname}
           host: ${_param:ceph_mon_node01_address}
+      keyring:
+        bootstrap-osd:
+          caps:
+            mon: "allow profile bootstrap-osd"
diff --git a/metadata/service/osd/cluster.yml b/metadata/service/osd/cluster.yml
index 88e79d3..92e2f36 100644
--- a/metadata/service/osd/cluster.yml
+++ b/metadata/service/osd/cluster.yml
@@ -7,4 +7,3 @@
   ceph:
     osd:
       enabled: true
-      host_id: ${_param:ceph_host_id}
diff --git a/metadata/service/osd/single.yml b/metadata/service/osd/single.yml
index 4fce284..e7cefd2 100644
--- a/metadata/service/osd/single.yml
+++ b/metadata/service/osd/single.yml
@@ -7,4 +7,3 @@
   ceph:
     osd:
       enabled: true
-      host_id: ${_param:ceph_host_id}
diff --git a/tests/pillar/ceph_osd_single.sls b/tests/pillar/ceph_osd_single.sls
index 81d0fa8..e85d447 100644
--- a/tests/pillar/ceph_osd_single.sls
+++ b/tests/pillar/ceph_osd_single.sls
@@ -29,7 +29,6 @@
     enabled: true
     crush_parent: rack01
     version: kraken
-    host_id: 10
     backend:
       filestore:
         disks: