diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 2785866..187fd0f 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -772,9 +772,13 @@
   use_default_network_scheme: 'True'
   sriov_network_subnet: 192.168.10.0/24
   ceph_enabled: 'True'
-  ceph_version: "luminous"
+  ceph_version: "nautilus"
   ceph_hyper_converged: "False"
+  # Apply settings for ceph from contexts/ceph/nautilus-collocated-block-db.yml
   ceph_osd_backend: "bluestore"
+  ceph_osds_per_device: '1'
+  ceph_osd_data_size: ''
+  ceph_osd_dmcrypt: False
   ceph_osd_count: "3"
   ceph_osd_node_count: 3
   ceph_osd_block_db_size: 20
@@ -782,14 +786,24 @@
   ceph_osd_bond_mode: "active-backup"
   ceph_osd_data_partition_prefix: ""
   ceph_public_network_allocation: storage
-  ceph_public_network: "10.167.11.0/24"
   ceph_cluster_network: "10.167.11.0/24"
   ceph_osd_single_address_ranges: "10.167.11.200-10.167.11.202"
   ceph_osd_deploy_address_ranges: "172.16.164.8-172.16.164.10"
   ceph_osd_storage_address_ranges: "10.167.11.200-10.167.11.202"
   ceph_osd_backend_address_ranges: "10.167.12.200-10.167.12.202"
+  # FIXME after deleting Ceph public network
+  ceph_public_network: 10.167.11.0/24
+  ceph_mon_node01_ceph_public_address: 10.167.11.66
+  ceph_mon_node02_ceph_public_address: 10.167.11.67
+  ceph_mon_node03_ceph_public_address: 10.167.11.68
+  ceph_rgw_node01_ceph_public_address: 10.167.11.76
+  ceph_rgw_node02_ceph_public_address: 10.167.11.77
+  ceph_rgw_node03_ceph_public_address: 10.167.11.78
+  ceph_osd_ceph_public_address_ranges: 10.167.11.201-10.167.11.203
+  # -end fixme
   ceph_osd_data_disks: "/dev/sdb"
-  ceph_osd_journal_or_block_db_disks: "/dev/sdb"
+  ceph_osd_journal_or_block_db_disks: ""
+  ceph_osd_block_partition_prefix: ''
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
   ceph_osd_primary_first_nic: "eth1"