diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 6fe4636ca..2c9d4552d 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -36,12 +36,16 @@ journal_size: 100
 pool_default_pg_num: 128
 pool_default_pgp_num: 128
 pool_default_size: 2
+pool_default_min_size: 1
 cluster_network: 192.168.0.0/24
 public_network: 192.168.0.0/24
 osd_mkfs_type: xfs
 osd_mkfs_options_xfs: -f -i size=2048
 osd_mount_options_xfs: noatime
 osd_mon_heartbeat_interval: 30
+# CRUSH
+pool_default_crush_rule: 0
+osd_crush_update_on_start: true
 # Object backend
 osd_objectstore: filestore
 # Performance tuning
diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 0708f78b7..f869e5093 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -55,6 +55,7 @@
   debug_paxos = 0/0
   debug_rgw = 0/0
 {% endif %}
+
 [mon]
   mon osd down out interval = {{ mon_osd_down_out_interval }}
   mon osd min down reporters = {{ mon_osd_min_down_reporters }}
@@ -90,6 +91,8 @@
   osd max backfills = {{ osd_max_backfills }}
   osd recovery op priority = {{ osd_recovery_op_priority }}
   osd objectstore = {{ osd_objectstore }}
+  osd crush update on start = {{ osd_crush_update_on_start }}
+
 {% if mds %}
 [mds]
 {% for host in groups['mdss'] %}