diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 3ca199f..a1b5508 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -43,13 +43,17 @@
   ceph_mon_node02_hostname: cmn02
   ceph_mon_node03_address: 10.167.4.68
   ceph_mon_node03_hostname: cmn03
+  # Apply changes for ceph from contexts/ceph/nautilus-encrypted-devices.yml
   ceph_osd_backend: bluestore
+  ceph_osds_per_device: '1'
+  ceph_osd_data_size: ''
+  ceph_osd_dmcrypt: True
   ceph_osd_block_db_size: '3'
   ceph_osd_data_partition_prefix: ""
   ceph_osd_bond_mode: active-backup
   ceph_osd_count: '3'
-  ceph_osd_data_disks: "/dev/vdb"
-  ceph_osd_journal_or_block_db_disks: "/dev/vdb"
+  ceph_osd_data_disks: "/dev/vdc"
+  ceph_osd_journal_or_block_db_disks: ""
   ceph_osd_mode: "separated"
   ceph_osd_node_count: '3'
   ceph_osd_journal_size: '3'
@@ -60,7 +64,6 @@
   ceph_osd_deploy_address_ranges: 10.167.5.70-10.167.5.72
   ceph_osd_backend_address_ranges: 10.167.6.201-10.167.6.203
   ceph_osd_storage_address_ranges: 10.167.4.201-10.167.4.203
-  ceph_public_network: 10.167.4.0/24
   ceph_public_network_allocation: storage
   ceph_rgw_address: 10.167.4.75
   ceph_rgw_hostname: rgw
@@ -70,8 +73,18 @@
   ceph_rgw_node02_hostname: rgw02
   ceph_rgw_node03_address: 10.167.4.78
   ceph_rgw_node03_hostname: rgw03
-  ceph_version: "luminous"
+  ceph_version: "nautilus"
   ceph_osd_block_partition_prefix: ''
+  # FIXME after deleting Ceph public network
+  ceph_public_network: 10.167.4.0/24
+  ceph_mon_node01_ceph_public_address: 10.167.4.66
+  ceph_mon_node02_ceph_public_address: 10.167.4.67
+  ceph_mon_node03_ceph_public_address: 10.167.4.68
+  ceph_rgw_node01_ceph_public_address: 10.167.4.76
+  ceph_rgw_node02_ceph_public_address: 10.167.4.77
+  ceph_rgw_node03_ceph_public_address: 10.167.4.78
+  ceph_osd_ceph_public_address_ranges: 10.167.4.201-10.167.4.203
+  # -end fixme
   cicd_control_node01_address: 10.167.4.91
   cicd_control_node01_hostname: cid01
   cicd_control_node02_address: 10.167.4.92