diff --git a/README.md b/README.md
index f5b076c..2e04b13 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-fuel-plugin-vmware-dvs
+fuel-plugin-manila
 ============
 
 Plugin description
\ No newline at end of file
diff --git a/components.yaml b/components.yaml
index 830bbd9..79d9aaf 100644
--- a/components.yaml
+++ b/components.yaml
@@ -4,9 +4,9 @@
 # - https://blueprints.launchpad.net/fuel/+spec/component-registry
 # - https://specs.openstack.org/openstack/fuel-specs/specs/8.0/component-registry.html
 
-- name: additional_service:fuel-plugin-vmware-dvs
+- name: additional_service:fuel-plugin-manila
   compatible: []
   requires: []
   incompatible: []
-  label: "Plugin label, that will be shown on UI"
-  description: "Component description (optional)"
+  label: "Manila Plugin label, that will be shown on UI"
+  description: "Manila is the Shared Network As A Service project"
diff --git a/deployment_scripts/puppet/manifests/notify.pp b/deployment_scripts/puppet/manifests/notify.pp
new file mode 100644
index 0000000..af32de0
--- /dev/null
+++ b/deployment_scripts/puppet/manifests/notify.pp
@@ -0,0 +1 @@
+notify {'MODULAR: fuel-plugin-manila': }
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index b25f768..1072623 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,16 +1,16 @@
 # These tasks will be merged into deployment graph. Here you
 # can specify new tasks for any roles, even built-in ones.
 
-- id: fuel-plugin-vmware-dvs_role
+- id: fuel-plugin-manila_role
   type: group
-  role: [fuel-plugin-vmware-dvs_role]
+  role: [fuel-plugin-manila_role]
   parameters:
     strategy:
       type: parallel
 
-- id: fuel-plugin-vmware-dvs-deployment-puppet
+- id: fuel-plugin-manila-deployment-puppet
   type: puppet
-  role: [fuel-plugin-vmware-dvs_role]
+  role: [fuel-plugin-manila_role]
 
 # If you do not want to use task-based deployment that is introduced as experimental
 # in fuel v8.0 comment code section below this comment, uncomment two lines below it
@@ -25,13 +25,13 @@
 #  required_for: [deploy_end]
 
   parameters:
-    puppet_manifest: "deploy.pp"
+    puppet_manifest: "puppet/manifests/notify.pp"
     puppet_modules: "."
     timeout: 3600
 
-#- id: fuel-plugin-vmware-dvs-post-deployment-sh
+#- id: fuel-plugin-manila-post-deployment-sh
 #  type: shell
-#  role: [fuel-plugin-vmware-dvs_role]
+#  role: [fuel-plugin-manila_role]
 #  version: 2.0.0
 #  cross-depends:
 #    - name: post_deployment_start
@@ -45,9 +45,9 @@
 #    interval: 20
 #    timeout: 180
 
-#- id: fuel-plugin-vmware-dvs-pre-deployment-sh
+#- id: fuel-plugin-manila-pre-deployment-sh
 #  type: shell
-#  role: [fuel-plugin-vmware-dvs_role]
+#  role: [fuel-plugin-manila_role]
 #  version: 2.0.0
 #  cross-depends:
 #    - name: pre_deployment_start
diff --git a/environment_config.yaml b/environment_config.yaml
index c44c287..8e7a41b 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -2,8 +2,8 @@ attributes:
   metadata:
     # Settings group can be one of "general", "security", "compute", "network",
     # "storage", "logging", "openstack_services" and "other".
-    group: 'other'
-  fuel-plugin-vmware-dvs_text:
+    group: 'storage'
+  fuel-plugin-manila_text:
     value: 'Set default value'
     label: 'Text field'
     description: 'Description for text field'
diff --git a/metadata.yaml b/metadata.yaml
index bcdf010..f6289e9 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,23 +1,23 @@
 # Plugin name
-name: fuel-plugin-vmware-dvs
+name: fuel-plugin-manila
 # Human-readable name for your plugin
-title: Title for fuel-plugin-vmware-dvs plugin
+title: Title for fuel-plugin-manila plugin
 # Plugin version
 version: '1.0.0'
 # Description
 description: Please describe your plugin here
 # Required fuel version
-fuel_version: ['8.0']
+fuel_version: ['9.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
-authors: ['Specify author or company name']
+authors: ['Mirantis']
 # A link to the plugin's page
-homepage: 'https://github.com/openstack/fuel-plugins'
+homepage: 'https://github.com/igajsin/manila-plugin'
 # Specify a group which your plugin implements, possible options:
 # network, storage, storage::cinder, storage::glance, hypervisor,
 # equipment
-groups: []
+groups: ['storage']
 # Change `false` to `true` if the plugin can be installed in the environment
 # after the deployment.
 is_hotpluggable: false
diff --git a/node_roles.yaml b/node_roles.yaml
index 07e8c0b..2fe9d66 100644
--- a/node_roles.yaml
+++ b/node_roles.yaml
@@ -1,4 +1,4 @@
-fuel-plugin-vmware-dvs_role:
+fuel-plugin-manila_role:
   # Role name
   name: "Set here the name for the role. This name will be displayed in the Fuel web UI"
   # Role description
diff --git a/volumes.yaml b/volumes.yaml
index b177c89..1ded0a3 100644
--- a/volumes.yaml
+++ b/volumes.yaml
@@ -1,6 +1,6 @@
 volumes_roles_mapping:
   # Default role mapping
-  fuel-plugin-vmware-dvs_role:
+  fuel-plugin-manila_role:
     - {allocate_size: "min", id: "os"}
 
 # Set here new volumes for your role