diff --git a/deployment_scripts/puppet/manifests/cinder.pp b/deployment_scripts/puppet/manifests/cinder.pp
index 1b922bf..d4397b7 100644
--- a/deployment_scripts/puppet/manifests/cinder.pp
+++ b/deployment_scripts/puppet/manifests/cinder.pp
@@ -1,5 +1,7 @@
 # The puppet configures OpenStack cinder to use ScaleIO.
 
+notice('MODULAR: scaleio: cinder')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   $all_nodes = hiera('nodes')
diff --git a/deployment_scripts/puppet/manifests/cluster.pp b/deployment_scripts/puppet/manifests/cluster.pp
index 1b167a5..8a8caf1 100644
--- a/deployment_scripts/puppet/manifests/cluster.pp
+++ b/deployment_scripts/puppet/manifests/cluster.pp
@@ -194,7 +194,8 @@ define cleanup_sds () {
 }
 
 
-# The only first mdm which is proposed to be the first master does cluster configuration
+notice('MODULAR: scaleio: cluster')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   if ! $scaleio['existing_cluster'] {
diff --git a/deployment_scripts/puppet/manifests/discovery_cluster.pp b/deployment_scripts/puppet/manifests/discovery_cluster.pp
index 58eced2..377133b 100644
--- a/deployment_scripts/puppet/manifests/discovery_cluster.pp
+++ b/deployment_scripts/puppet/manifests/discovery_cluster.pp
@@ -1,5 +1,7 @@
 # The puppet discovers cluster and updates mdm_ips and tb_ips values for next cluster task.
 
+notice('MODULAR: scaleio: discovery_cluster')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   if ! $scaleio['existing_cluster'] {
diff --git a/deployment_scripts/puppet/manifests/environment.pp b/deployment_scripts/puppet/manifests/environment.pp
index 02db1e4..3224466 100644
--- a/deployment_scripts/puppet/manifests/environment.pp
+++ b/deployment_scripts/puppet/manifests/environment.pp
@@ -10,6 +10,8 @@ define env_fact($role, $fact, $value) {
   }
 }
 
+notice('MODULAR: scaleio: environment')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   notify{'ScaleIO plugin enabled': }
diff --git a/deployment_scripts/puppet/manifests/environment_existing_mdm_ips.pp b/deployment_scripts/puppet/manifests/environment_existing_mdm_ips.pp
index ea5b98d..fcd9d44 100644
--- a/deployment_scripts/puppet/manifests/environment_existing_mdm_ips.pp
+++ b/deployment_scripts/puppet/manifests/environment_existing_mdm_ips.pp
@@ -10,6 +10,8 @@ define env_fact($role, $fact, $value) {
   }
 }
 
+notice('MODULAR: scaleio: environment_existing_mdm_ips')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   if $scaleio['existing_cluster'] {
diff --git a/deployment_scripts/puppet/manifests/gateway_server.pp b/deployment_scripts/puppet/manifests/gateway_server.pp
index 5a9f0c3..3929c87 100644
--- a/deployment_scripts/puppet/manifests/gateway_server.pp
+++ b/deployment_scripts/puppet/manifests/gateway_server.pp
@@ -1,5 +1,7 @@
 # The puppet configures ScaleIO Gateway. Sets the password and connects to MDMs.
 
+notice('MODULAR: scaleio: gateway_server')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   if ! $scaleio['existing_cluster'] {
diff --git a/deployment_scripts/puppet/manifests/glance.pp b/deployment_scripts/puppet/manifests/glance.pp
index 49048ca..310ba94 100644
--- a/deployment_scripts/puppet/manifests/glance.pp
+++ b/deployment_scripts/puppet/manifests/glance.pp
@@ -18,6 +18,9 @@ define glance_config(
   }
 }
 
+
+notice('MODULAR: scaleio: glance')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   $all_nodes = hiera('nodes')
diff --git a/deployment_scripts/puppet/manifests/glance_create_test_image.pp b/deployment_scripts/puppet/manifests/glance_create_test_image.pp
index a50ab73..47d5e56 100644
--- a/deployment_scripts/puppet/manifests/glance_create_test_image.pp
+++ b/deployment_scripts/puppet/manifests/glance_create_test_image.pp
@@ -1,5 +1,7 @@
 # The puppet create new OpenStack Glance's test image.
 
+notice('MODULAR: scaleio: glance_create_test_image')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   $all_nodes = hiera('nodes')
diff --git a/deployment_scripts/puppet/manifests/glance_delete_test_image.pp b/deployment_scripts/puppet/manifests/glance_delete_test_image.pp
index 19bd37e..12c8b2b 100644
--- a/deployment_scripts/puppet/manifests/glance_delete_test_image.pp
+++ b/deployment_scripts/puppet/manifests/glance_delete_test_image.pp
@@ -1,6 +1,8 @@
 # The puppet removes OpenStack Glance's test image if it exists.
 # It's needed to change default backend for images.
 
+notice('MODULAR: scaleio: glance_delete_test_image')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   $all_nodes = hiera('nodes')
diff --git a/deployment_scripts/puppet/manifests/mdm_package.pp b/deployment_scripts/puppet/manifests/mdm_package.pp
index f847933..798e2d7 100644
--- a/deployment_scripts/puppet/manifests/mdm_package.pp
+++ b/deployment_scripts/puppet/manifests/mdm_package.pp
@@ -1,5 +1,7 @@
 # The puppet installs ScaleIO MDM packages.
 
+notice('MODULAR: scaleio: mdm_package')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   if ! $scaleio['existing_cluster'] {
diff --git a/deployment_scripts/puppet/manifests/mdm_server.pp b/deployment_scripts/puppet/manifests/mdm_server.pp
index d1e845b..83724f6 100644
--- a/deployment_scripts/puppet/manifests/mdm_server.pp
+++ b/deployment_scripts/puppet/manifests/mdm_server.pp
@@ -1,5 +1,7 @@
 # The puppet installs ScaleIO MDM packages.
 
+notice('MODULAR: scaleio: mdm_server')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   if ! $scaleio['existing_cluster'] {
diff --git a/deployment_scripts/puppet/manifests/nova.pp b/deployment_scripts/puppet/manifests/nova.pp
index 800c40f..02521fd 100644
--- a/deployment_scripts/puppet/manifests/nova.pp
+++ b/deployment_scripts/puppet/manifests/nova.pp
@@ -1,5 +1,7 @@
 # The puppet configures OpenStack nova to use ScaleIO.
 
+notice('MODULAR: scaleio: nova')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   $all_nodes = hiera('nodes')
diff --git a/deployment_scripts/puppet/manifests/os.pp b/deployment_scripts/puppet/manifests/os.pp
index 2a42a64..1a06aea 100644
--- a/deployment_scripts/puppet/manifests/os.pp
+++ b/deployment_scripts/puppet/manifests/os.pp
@@ -31,6 +31,8 @@ define apply_flavor(
   }
 }
 
+notice('MODULAR: scaleio: os')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   $all_nodes = hiera('nodes')
diff --git a/deployment_scripts/puppet/manifests/resize_cluster.pp b/deployment_scripts/puppet/manifests/resize_cluster.pp
index 4d99ef8..f2f94c0 100644
--- a/deployment_scripts/puppet/manifests/resize_cluster.pp
+++ b/deployment_scripts/puppet/manifests/resize_cluster.pp
@@ -10,6 +10,9 @@ define cleanup_mdm () {
   }
 }
 
+
+notice('MODULAR: scaleio: resize_cluster')
+
 # The only mdm with minimal IP from current MDMs does cleaunp
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
diff --git a/deployment_scripts/puppet/manifests/sdc.pp b/deployment_scripts/puppet/manifests/sdc.pp
index a1eda70..dbd2881 100644
--- a/deployment_scripts/puppet/manifests/sdc.pp
+++ b/deployment_scripts/puppet/manifests/sdc.pp
@@ -1,6 +1,8 @@
 # The puppet installs ScaleIO SDC packages and connect to MDMs.
 # It expects that any controller could be MDM
 
+notice('MODULAR: scaleio: sdc')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   if ! $::controller_ips {
diff --git a/deployment_scripts/puppet/manifests/sdc_server.pp b/deployment_scripts/puppet/manifests/sdc_server.pp
index cd6211f..841991c 100644
--- a/deployment_scripts/puppet/manifests/sdc_server.pp
+++ b/deployment_scripts/puppet/manifests/sdc_server.pp
@@ -1,5 +1,7 @@
 # The puppet installs ScaleIO SDS packages.
 
+notice('MODULAR: scaleio: sdc_server')
+
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
   $all_nodes = hiera('nodes')
diff --git a/deployment_scripts/puppet/manifests/sds_server.pp b/deployment_scripts/puppet/manifests/sds_server.pp
index f0d7c39..2691c84 100644
--- a/deployment_scripts/puppet/manifests/sds_server.pp
+++ b/deployment_scripts/puppet/manifests/sds_server.pp
@@ -9,6 +9,8 @@ define sds_device_cleanup() {
   }
 }
 
+notice('MODULAR: scaleio: sds_server')
+
 # Just install packages
 $scaleio = hiera('scaleio')
 if $scaleio['metadata']['enabled'] {
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index b1aed9e..cef4b15 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -188,11 +188,12 @@
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
 
-- id: scaleio-glance-cleanup
+- id: scaleio-glance-delete-test-image
   required_for: [post_deployment_end]
-  requires: [scaleio-configure-cluster]
+  requires: [scaleio-configure-cluster, upload_cirros]
   cross-depends:
     - name: scaleio-configure-cluster
+    - name: upload_cirros
   role: [primary-controller]
   type: puppet
   parameters:
@@ -202,9 +203,9 @@
 
 - id: scaleio-glance
   required_for: [post_deployment_end]
-  requires: [scaleio-glance-cleanup]
+  requires: [scaleio-glance-delete-test-image]
   cross-depends:
-    - name: scaleio-glance-cleanup
+    - name: scaleio-glance-delete-test-image
   role: [primary-controller, controller]
   type: puppet
   parameters:
@@ -212,7 +213,7 @@
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
 
-- id: scaleio-glance-test-image
+- id: scaleio-glance-create-test-image
   required_for: [post_deployment_end]
   requires: [scaleio-glance]
   cross-depends: