diff --git a/README.md b/README.md
index b4dbc29..e0d6cd5 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Requirements
 
 | Requirement                      | Version/Comment |
 |:---------------------------------|:----------------|
-| Mirantis OpenStack compatibility | >= 7.0          |
+| Mirantis OpenStack compatibility | 8.0             |
 
 Limitations
 -----------
@@ -54,7 +54,7 @@ To install EMC VNX plugin, follow these steps:
     that. If you do not have the Fuel Master node yet, see
     [Quick Start Guide](https://software.mirantis.com/quick-start/):
 
-        # scp emc_vnx-2.0-2.0.0-0.noarch.rpm root@<Fuel_master_ip>:/tmp
+        # scp emc_vnx-3.0-3.0.0-0.noarch.rpm root@<Fuel_master_ip>:/tmp
 
 3. Log into the Fuel Master node. Install the plugin:
 
@@ -66,7 +66,7 @@ To install EMC VNX plugin, follow these steps:
         # fuel plugins
         id | name    | version | package_version
         ---|---------|---------|----------------
-        1  | emc_vnx | 2.0.0   | 2.0.0
+        1  | emc_vnx | 3.0.0   | 3.0.0
 
 EMC VNX plugin configuration
 ----------------------------
@@ -86,17 +86,3 @@ EMC VNX plugin configuration
     /blob/master/README_ISCSI.md#multiple-pools-support)
 3. Deploy the environment without a Cinder node. All required Cinder services
     are run on Controller nodes.
-
-Release Notes
--------------
-
-This is the first release of the plugin.
-
-Contributors
-------------
-
-Dmitry Klenov <dklenov@mirantis.com> (PM)
-Szymon Bańka <sbanka@mirantis.com> (developer)
-Piotr Misiak <pmisiak@mirantis.com> (developer)
-Dmitry Kalashnik <dkalashnik@mirantis.com> (QA engineer)
-Maciej Relewicz <mrelewicz@mirantis.com> (developer)
diff --git a/components.yaml b/components.yaml
new file mode 100644
index 0000000..5532c83
--- /dev/null
+++ b/components.yaml
@@ -0,0 +1,8 @@
+- name: 'storage:block:emc'
+  label: 'EMC'
+  description: 'EMC Driver for Cinder'
+  compatible:
+    - name: 'hypervisor:libvirt:*'
+  incompatible:
+    - name: 'storage:block:ceph'
+    - name: 'storage:block:lvm'
diff --git a/deployment_scripts/puppet/manifests/compute.pp b/deployment_scripts/puppet/manifests/compute.pp
index d0b64a7..abe56ee 100644
--- a/deployment_scripts/puppet/manifests/compute.pp
+++ b/deployment_scripts/puppet/manifests/compute.pp
@@ -14,3 +14,4 @@
 #    under the License.
 #
 include plugin_emc_vnx::compute
+notice('MODULAR: emc/compute.pp')
diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index b7ff7d3..68b9788 100644
--- a/deployment_scripts/puppet/manifests/controller.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -14,3 +14,4 @@
 #    under the License.
 #
 include plugin_emc_vnx::controller
+notice('MODULAR: emc/controller.pp')
diff --git a/deployment_scripts/puppet/manifests/primary_controller.pp b/deployment_scripts/puppet/manifests/primary_controller.pp
index f8061a0..058fdf9 100644
--- a/deployment_scripts/puppet/manifests/primary_controller.pp
+++ b/deployment_scripts/puppet/manifests/primary_controller.pp
@@ -14,3 +14,4 @@
 #    under the License.
 #
 include plugin_emc_vnx::primary_controller
+notice('MODULAR: emc/primary_controller.pp')
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
new file mode 100644
index 0000000..c5c2300
--- /dev/null
+++ b/deployment_tasks.yaml
@@ -0,0 +1,27 @@
+- id: emc-primary-controller
+  groups: ['primary-controller']
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/manifests/primary_controller.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 360
+  required_for: [deploy_end]
+  requires: [controller_remaining_tasks]
+- id: emc-controller
+  role: ['controller']
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/manifests/controller.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 360
+  requires: [post_deployment_start]
+  required_for: [post_deployment_end]
+- id: emc-compute
+  role: ['compute']
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/manifests/compute.pp
+    puppet_modules: puppet/modules:/etc/puppet/modules
+    timeout: 360
+  requires: [post_deployment_start]
+  required_for: [post_deployment_end]
diff --git a/metadata.yaml b/metadata.yaml
index b7cb355..c65708c 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,11 +2,11 @@
 name: emc_vnx
 title: EMC VNX driver for Cinder
 # Plugin version
-version: 2.0.0
+version: 3.0.0
 # Description
 description: Enables EMC VNX driver in Cinder
 # Required fuel version
-fuel_version: ['7.0']
+fuel_version: ['8.0']
 # Groups
 groups: ['storage::cinder']
 # Licenses
@@ -14,20 +14,18 @@ licenses: ['Apache License, Version 2.0']
 # Homepage
 homepage: 'https://github.com/stackforge/fuel-plugin-external-emc'
 # Authors
-authors: ['Dmitry Klenov <dklenov@mirantis.com>', 'Piotr Misiak <pmisiak@mirantis.com>', 'Szymon Banka <sbanka@mirantis.com>', 'Dmitry Kalashnik <dkalashnik@mirantis.com>']
+authors: ['Dmitry Klenov <dklenov@mirantis.com>', 'Piotr Misiak <pmisiak@mirantis.com>', 'Szymon Banka <sbanka@mirantis.com>', 'Dmitry Kalashnik <dkalashnik@mirantis.com>', 'Oleksandr Martsyniuk <omartsyniuk@mirantis.com']
+# Change `false` to `true` if the plugin can be installed in the environment
+# after the deployment.
+is_hotpluggable: false
 
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: 2015.1.0-7.0
+    version: liberty-8.0
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
-  - os: centos
-    version: 2015.1.0-7.0
-    mode: ['ha']
-    deployment_scripts_path: deployment_scripts/
-    repository_path: repositories/centos
 
 # Version of plugin package
-package_version: '2.0.0'
+package_version: '4.0.0'
diff --git a/tasks.yaml b/tasks.yaml
index 409a7eb..fe51488 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,21 +1 @@
-- role: ['primary-controller']
-  stage: post_deployment/6100
-  type: puppet
-  parameters:
-    puppet_manifest: puppet/manifests/primary_controller.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 360
-- role: ['controller']
-  stage: post_deployment/6101
-  type: puppet
-  parameters:
-    puppet_manifest: puppet/manifests/controller.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 360
-- role: ['compute']
-  stage: post_deployment/6102
-  type: puppet
-  parameters:
-    puppet_manifest: puppet/manifests/compute.pp
-    puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 360
+[]