diff --git a/README.md b/README.md
index c73f482..708b57b 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ Requirements
 
 | Requirement                                                                              | Version/Comment                                         |
 |------------------------------------------------------------------------------------------|---------------------------------------------------------|
-| Mirantis Openstack compatibility                                                         | 6.0                                                     |
-| Netapp filer or appliance  is reacheble via one of the Mirantis OPenstack networks       | Cluster mode or 7 mode storage familly                  |
+| Mirantis Openstack compatibility                                                         | 6.1                                                     |
+| Netapp filer or appliance  is reacheble via one of the Mirantis OPenstack networks       | Cluster mode or 7 mode storage familly with nfs4 enabled|
 
 
 
@@ -254,19 +254,23 @@ cinder-netapp plugin installation
 
    ``fpb --build fuel-plugin-cinder-netapp/``
 
-4. The cinder_netapp-<x.x.x>.fp file will be created in the plugin folder (fuel-plugin-cinder-netapp)
+4. The cinder_netapp-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-cinder-netapp)
 
 5. Move this file to the Fuel Master node with secure copy (scp):
 
-   ``scp cinder_netapp-<x.x.x>.fp root@:<the_Fuel_Master_node_IP address>:/tmp``
+   ``scp cinder_netapp-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP address>:/tmp``
 
    ``cd /tmp``
 
 6. Install the cinder_netapp plugin:
 
-   ``fuel plugins --install cinder_netapp-<x.x.x>.fp``
+   ``fuel plugins --install cinder_netapp-<x.x.x>.rpm``
 
-6. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
+7. Verify that the plugin is installed correctly:
+
+   ``fuel plugins --list``
+
+8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
 
 
 User Guide
@@ -319,6 +323,10 @@ None.
 Release Notes
 -------------
 
+**2.0.0**
+
+* migrate plugins from 1.0.0 to 2.0.0 package version
+
 **1.2.0**
 
 * add  multi backend support
diff --git a/metadata.yaml b/metadata.yaml
index 21ea813..0da686c 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,24 +3,30 @@ name: cinder_netapp
 # Human-readable name for your plugin
 title: Cinder and NetApp integration
 # Plugin version
-version: 1.2.0
+version: 2.0.0
 # Description
 description: Enable to use NetApp nfs driver as a Cinder backend
 # Required fuel version
-fuel_version: ['6.0']
+fuel_version: ['6.1']
+
+authors: ['Mirantis Inc','Orange']
+licenses: [Apache License Version 2.0]
+homepage: https://github.com/stackforge/fuel-plugin-tls
+groups: ['storage::cinder']
+
 
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: 2014.2-6.0
+    version: 2014.2-6.1
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
   - os: centos
-    version: 2014.2-6.0
+    version: 2014.2-6.1
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/centos
 
 # Version of plugin package
-package_version: '1.0.0'
+package_version: '2.0.0'
diff --git a/tasks.yaml b/tasks.yaml
index 6f21878..4339e01 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,19 +1,19 @@
-- role: ['controller']
-  stage: post_deployment
+- role: ['primary-controller','controller']
+  stage: post_deployment/6000
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/site_controller.pp
     puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
     timeout: 360
 - role: ['compute']
-  stage: post_deployment
+  stage: post_deployment/6001
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/site_compute.pp
     puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
     timeout: 360
 - role: ['cinder']
-  stage: post_deployment
+  stage: post_deployment/6002
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/site_cinder.pp