diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index a3b3139..835952c 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -823,7 +823,7 @@
   openldap_domain: heat-bm-cicd-queens-contrail-sl.local
   openldap_enabled: 'True'
   openldap_organisation: ${_param:cluster_name}
-  # Apply ceph setting from contexts/ceph/nautilus-multiple-osd.yml
+  # Apply ceph settings from nautilus-collocated-block-db.yml
   ceph_enabled: 'True'
   ceph_version: "nautilus"
   ceph_hyper_converged: "False"
@@ -835,8 +835,6 @@
   ceph_osd_journal_size: 20
   ceph_osd_bond_mode: "active-backup"
   ceph_osd_data_partition_prefix: ""
-  ceph_osds_per_device: '3'
-  ceph_osd_data_size: '80'
 
   ceph_public_network_allocation: storage
   ceph_cluster_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
@@ -849,9 +847,10 @@
   ceph_osd_storage_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.200-==IPV4_NET_CONTROL_PREFIX==.202"
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.200-==IPV4_NET_TENANT_PREFIX==.202"
 
+  ceph_osds_per_device: '1'
   ceph_osd_data_disks: "/dev/sdb"
   ceph_osd_block_partition_prefix: ''
-  ceph_osd_journal_or_block_db_disks: "/dev/sdc"
+  ceph_osd_journal_or_block_db_disks: ""
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
   ceph_osd_primary_first_nic: "eth1"