diff --git a/README.md b/README.md
index 04c424e..10ee1b7 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Requirements
 
 | Requirement                      | Version/Comment                                         |
 |----------------------------------|---------------------------------------------------------|
-| Mirantis Openstack compatibility | 6.0                                                     |
+| Mirantis Openstack compatibility | 6.1                                                     |
 |----------------------------------|---------------------------------------------------------|
 | NFS Server                       | an NFS server with volume accessible from compute nodes |
 
@@ -49,18 +49,21 @@ Nova-nfs plugin installation
 
    ``fpb --build fuel-plugin-nova-nfs/``
 
-4. The nova_nfs-<x.x.x>.fp file will be created in the plugin folder (fuel-plugin-nova-nfs)
+4. The nova_nfs-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-nova-nfs)
 
 5. Move this file to the Fuel Master node with secure copy (scp):
 
-   ``scp nova_nfs-<x.x.x>.fp root@:<the_Fuel_Master_node_IP address>:/tmp``
+   ``scp nova_nfs-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP address>:/tmp``
    ``cd /tmp``
 
 6. Install the nova-nfs plugin:
 
-   ``fuel plugins --install nova_nfs-<x.x.x>.fp``
-
-6. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
+   ``fuel plugins --install nova_nfs-<x.x.x>.rpm``
+   
+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
 ==========
@@ -103,5 +106,8 @@ Release Notes
 
 * Initial release of the plugin
 
+**2.0.0**
+
+* Update plugin to Fuel 6.1 release
 
 
diff --git a/metadata.yaml b/metadata.yaml
index 13e84db..cddb40e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,35 +2,31 @@
 name: nova_nfs
 title: Nova NFS plugin
 # Plugin version
-version: 1.0.0
+version: 2.0.0
 # Description
 description: Enables Nova to use NFS volume as storage backend for ephemeral volumes
 # Required fuel version
-fuel_version: ['6.0']
-
+fuel_version: ['6.1']
+# Specify license of your plugin
+licenses: ['Apache License Version 2.0']
+# Specify author or company name
+authors: ['Orange']
+# A link to the plugin's page
+homepage: 'https://github.com/stackforge/fuel-plugin-nova-nfs'
+# Specify a group which your plugin implements, possible options:
+# network, storage, storage::cinder, storage::glance, hypervisor
+groups: ['storage']
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: 2014.2-6.0
+    version: 2014.2.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.2-6.1
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/centos
-  - os: ubuntu
-    version: 2014.2-6.0.1
-    mode: ['ha', 'multinode']
-    deployment_scripts_path: deployment_scripts/
-    repository_path: repositories/ubuntu
-  - os: centos
-    version: 2014.2-6.0.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 18e53a0..04e745d 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,6 +1,6 @@
 # This task is required for compute nodes
 - role: ['compute']
-  stage: post_deployment
+  stage: post_deployment/2000
   type: puppet
   parameters:
     puppet_manifest: puppet/site.pp