diff --git a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml
index 66cd81c..3281b06 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dop-sl2/underlay.yaml
@@ -215,6 +215,12 @@
          - name: cfg01_day01_image               # Pre-configured day01 image
            source_image: {{ os_env('IMAGE_PATH_CFG01_DAY01', os_env('IMAGE_PATH1604')) }} # http://images.mirantis.com/cfg01-day01.qcow2 or fallback to IMAGE_PATH1604
            format: qcow2
+         - name: mcp_ubuntu_1604_image           # Pre-configured image for VCP nodes initially based on kvm nodes.
+           # http://images.mirantis.com/ubuntu-16-04-x64-latest.qcow2  (preffered)
+           # or
+           # https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+           source_image: {{ os_env('MCP_IMAGE_PATH1604', os_env('IMAGE_PATH1604')) }}
+           format: qcow2
 
         nodes:
           - name: {{ HOSTNAME_CFG01 }}
@@ -267,7 +273,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('CID_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: iso  # Volume with name 'iso' will be used
                              # for store image with cloud-init metadata.
@@ -305,7 +311,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('CID_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: iso  # Volume with name 'iso' will be used
                              # for store image with cloud-init metadata.
@@ -331,7 +337,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('CID_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: iso  # Volume with name 'iso' will be used
                              # for store image with cloud-init metadata.
@@ -357,7 +363,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('CTL_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: cinder
                   capacity: 50
@@ -386,7 +392,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('CTL_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: cinder
                   capacity: 50
@@ -415,7 +421,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('CTL_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: cinder
                   capacity: 50
@@ -444,7 +450,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('MON_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: cinder
                   capacity: 50
@@ -473,7 +479,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('MON_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: cinder
                   capacity: 50
@@ -502,7 +508,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('MON_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: cinder
                   capacity: 50
@@ -531,7 +537,7 @@
               volumes:
                 - name: system
                   capacity: {{ os_env('MON_NODE_VOLUME_SIZE', 150) }}
-                  backing_store: cloudimage1604
+                  backing_store: mcp_ubuntu_1604_image
                   format: qcow2
                 - name: cinder
                   capacity: 50