diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml
index 28f17dc..a8d5aae 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml
@@ -17,19 +17,19 @@
   ceph_osd_backend: bluestore
   ceph_osd_block_db_size: '10'
   ceph_osd_bond_mode: active-backup
-  ceph_osd_count: '2'
+  ceph_osd_count: '3'
   ceph_osd_data_disks: /dev/vdb
   ceph_osd_journal_or_block_db_disks: /dev/vdc
-  ceph_osd_node_count: '2'
+  ceph_osd_node_count: '3'
   ceph_osd_journal_size: '10'
   ceph_osd_primary_first_nic: eth1
   ceph_osd_primary_second_nic: eth2
   ceph_osd_rack01_backend_subnet: 172.16.10
   ceph_osd_rack01_hostname: osd
   ceph_osd_rack01_single_subnet: 172.16.10
-  ceph_osd_single_address_ranges: 172.16.10.94-172.16.10.95
-  ceph_osd_deploy_address_ranges: 172.16.11.94-172.16.11.95
-  ceph_osd_backend_address_ranges: 172.16.10.94-172.16.10.95
+  ceph_osd_single_address_ranges: 172.16.10.87-172.16.10.89
+  ceph_osd_deploy_address_ranges: 172.16.11.87-172.16.11.89
+  ceph_osd_backend_address_ranges: 172.16.10.87-172.16.10.89
   ceph_public_network: 172.16.10.0/24
   ceph_rgw_address: 172.16.10.75
   ceph_rgw_hostname: rgw
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/underlay.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/underlay.yaml
index aa97a65..926dbcf 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/underlay.yaml
@@ -30,6 +30,7 @@
 {% set HOSTNAME_RGW03 = os_env('HOSTNAME_CMN03', 'rgw03.' + DOMAIN_NAME ) %}
 {% set HOSTNAME_OSD01 = os_env('HOSTNAME_OSD01', 'osd001.' + DOMAIN_NAME ) %}
 {% set HOSTNAME_OSD02 = os_env('HOSTNAME_OSD02', 'osd002.' + DOMAIN_NAME ) %}
+{% set HOSTNAME_OSD03 = os_env('HOSTNAME_OSD03', 'osd003.' + DOMAIN_NAME) %}
 {% set HOSTNAME_GTW01 = os_env('HOSTNAME_GTW01', 'gtw01.' + DOMAIN_NAME ) %}
 {% set HOSTNAME_PRX01 = os_env('HOSTNAME_PRX01', 'prx01.' + DOMAIN_NAME ) %}
 
@@ -53,8 +54,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -81,8 +83,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -109,8 +112,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -137,8 +141,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -693,6 +698,38 @@
               interfaces: *interfaces
               network_config: *network_config
 
+          - name: {{ HOSTNAME_OSD03 }}
+            role: salt_minion
+            params:
+              vcpu: !os_env SLAVE_NODE_CPU, 2
+              memory: !os_env SLAVE_NODE_MEMORY, 2048
+              boot:
+                - hd
+              cloud_init_volume_name: iso
+              cloud_init_iface_up: ens3
+              volumes:
+                - name: system
+                  capacity: !os_env NODE_VOLUME_SIZE, 150
+                  backing_store: cloudimage1604
+                  format: qcow2
+                - name: ceph_osd
+                  capacity: 50
+                  format: qcow2
+                - name: ceph_journal
+                  capacity: 50
+                  format: qcow2
+                - name: iso  # Volume with name 'iso' will be used
+                             # for store image with cloud-init metadata.
+                  capacity: 1
+                  format: raw
+                  device: cdrom
+                  bus: ide
+                  cloudinit_meta_data: *cloudinit_meta_data
+                  cloudinit_user_data: *cloudinit_user_data_1604
+
+              interfaces: *interfaces
+              network_config: *network_config
+
           - name: {{ HOSTNAME_RGW01 }}
             role: salt_minion
             params:
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/_context-cookiecutter-mcp-ocata-dvr-ceph.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/_context-cookiecutter-mcp-ocata-dvr-ceph.yaml
index 8dc1f6f..261c2e7 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/_context-cookiecutter-mcp-ocata-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/_context-cookiecutter-mcp-ocata-dvr-ceph.yaml
@@ -13,19 +13,19 @@
   ceph_osd_backend: bluestore
   ceph_osd_block_db_size: '10'
   ceph_osd_bond_mode: active-backup
-  ceph_osd_count: '2'
+  ceph_osd_count: '3'
   ceph_osd_data_disks: /dev/vdb
   ceph_osd_journal_or_block_db_disks: /dev/vdc
-  ceph_osd_node_count: '2'
+  ceph_osd_node_count: '3'
   ceph_osd_journal_size: '10'
   ceph_osd_primary_first_nic: eth1
   ceph_osd_primary_second_nic: eth2
   ceph_osd_rack01_backend_subnet: 172.16.10
   ceph_osd_rack01_hostname: osd
   ceph_osd_rack01_single_subnet: 172.16.10
-  ceph_osd_single_address_ranges: 172.16.10.94-172.16.10.95
-  ceph_osd_deploy_address_ranges: 172.16.11.94-172.16.11.95
-  ceph_osd_backend_address_ranges: 172.16.10.94-172.16.10.95
+  ceph_osd_single_address_ranges: 172.16.10.87-172.16.10.89
+  ceph_osd_deploy_address_ranges: 172.16.11.87-172.16.11.89
+  ceph_osd_backend_address_ranges: 172.16.10.87-172.16.10.89
   ceph_public_network: 172.16.10.0/24
   ceph_rgw_address: 172.16.10.75
   ceph_rgw_hostname: rgw
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/underlay.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/underlay.yaml
index d1c9a3a..312ef08 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-ceph/underlay.yaml
@@ -30,6 +30,7 @@
 {% set HOSTNAME_RGW03 = os_env('HOSTNAME_CMN03', 'rgw03.' + DOMAIN_NAME) %}
 {% set HOSTNAME_OSD01 = os_env('HOSTNAME_OSD01', 'osd001.' + DOMAIN_NAME) %}
 {% set HOSTNAME_OSD02 = os_env('HOSTNAME_OSD02', 'osd002.' + DOMAIN_NAME) %}
+{% set HOSTNAME_OSD03 = os_env('HOSTNAME_OSD03', 'osd003.' + DOMAIN_NAME) %}
 {% set HOSTNAME_GTW01 = os_env('HOSTNAME_GTW01', 'gtw01.' + DOMAIN_NAME) %}
 {% set HOSTNAME_PRX01 = os_env('HOSTNAME_PRX01', 'prx01.' + DOMAIN_NAME) %}
 
@@ -53,8 +54,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -81,8 +83,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -109,8 +112,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -137,8 +141,9 @@
             default_{{ HOSTNAME_MON01 }}: +107
             default_{{ HOSTNAME_MON02 }}: +108
             default_{{ HOSTNAME_MON03 }}: +109
-            default_{{ HOSTNAME_OSD01 }}: +94
-            default_{{ HOSTNAME_OSD02 }}: +95
+            default_{{ HOSTNAME_OSD01 }}: +87
+            default_{{ HOSTNAME_OSD02 }}: +88
+            default_{{ HOSTNAME_OSD03 }}: +89
             default_{{ HOSTNAME_CMN01 }}: +96
             default_{{ HOSTNAME_CMN02 }}: +97
             default_{{ HOSTNAME_CMN03 }}: +98
@@ -693,6 +698,38 @@
               interfaces: *interfaces
               network_config: *network_config
 
+          - name: {{ HOSTNAME_OSD03 }}
+            role: salt_minion
+            params:
+              vcpu: !os_env SLAVE_NODE_CPU, 2
+              memory: !os_env SLAVE_NODE_MEMORY, 2048
+              boot:
+                - hd
+              cloud_init_volume_name: iso
+              cloud_init_iface_up: ens3
+              volumes:
+                - name: system
+                  capacity: !os_env NODE_VOLUME_SIZE, 150
+                  backing_store: cloudimage1604
+                  format: qcow2
+                - name: ceph_osd
+                  capacity: 50
+                  format: qcow2
+                - name: ceph_journal
+                  capacity: 50
+                  format: qcow2
+                - name: iso  # Volume with name 'iso' will be used
+                             # for store image with cloud-init metadata.
+                  capacity: 1
+                  format: raw
+                  device: cdrom
+                  bus: ide
+                  cloudinit_meta_data: *cloudinit_meta_data
+                  cloudinit_user_data: *cloudinit_user_data_1604
+
+              interfaces: *interfaces
+              network_config: *network_config
+
           - name: {{ HOSTNAME_RGW01 }}
             role: salt_minion
             params: