diff --git a/deployment_scripts/puppet/manifests/keystone.pp b/deployment_scripts/puppet/manifests/keystone.pp
index acabcd6..6cae92f 100644
--- a/deployment_scripts/puppet/manifests/keystone.pp
+++ b/deployment_scripts/puppet/manifests/keystone.pp
@@ -8,7 +8,7 @@ $public_ip        = $network_metadata['vips']['public']['ipaddr']
 $admin_ip         = $network_metadata['vips']['management']['ipaddr']
 $internal_ip      = $admin_ip
 
-class {'::puppet-manila::keystone::auth':
+class {'::manila::keystone::auth':
   password        => $pass,
   public_url      => "http://${public_ip}:8786/v1/%(tenant_id)s",
   public_url_v2   => "http://${public_ip}:8786/v2/%(tenant_id)s",
diff --git a/deployment_scripts/puppet/manifests/override_hiera.pp b/deployment_scripts/puppet/manifests/override_hiera.pp
deleted file mode 100644
index fbc1c7a..0000000
--- a/deployment_scripts/puppet/manifests/override_hiera.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-notify {'MODULAR: manila/override_hiera'}
-
-override_hiera('/etc/hiera/plugins/fuel-plugin-manila.yaml')
diff --git a/deployment_scripts/puppet/manifests/populate_hiera.pp b/deployment_scripts/puppet/manifests/populate_hiera.pp
index a7a8fa3..ab2a83b 100644
--- a/deployment_scripts/puppet/manifests/populate_hiera.pp
+++ b/deployment_scripts/puppet/manifests/populate_hiera.pp
@@ -5,8 +5,5 @@ $file         = '/etc/hiera/plugins/fuel-plugin-manila.yaml'
 $new_password = generate("/bin/bash", "-c", "/bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n")
 
 if ! $manila {
-  notify {"DBG! manila is empty. Do something ${new_npassword}": }
   populate_hiera($file, 'user_password', $new_password)
-  } else {
-  notify {"DBG! manila non empty. is ${manila}": }
   }
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 1072623..6648202 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -1,62 +1,39 @@
-# These tasks will be merged into deployment graph. Here you
-# can specify new tasks for any roles, even built-in ones.
-
-- id: fuel-plugin-manila_role
-  type: group
-  role: [fuel-plugin-manila_role]
-  parameters:
-    strategy:
-      type: parallel
-
-- id: fuel-plugin-manila-deployment-puppet
+- id: manila-start
   type: puppet
-  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
-# and do the same for tasks below.
-
+  role: [primary-controller, controller]
   version: 2.0.0
   cross-depends:
     - name: deploy_start
   cross-depended-by:
     - name: deploy_end
-#  requires: [deploy_start] # version 1.0.0
-#  required_for: [deploy_end]
-
   parameters:
     puppet_manifest: "puppet/manifests/notify.pp"
     puppet_modules: "."
     timeout: 3600
 
-#- id: fuel-plugin-manila-post-deployment-sh
-#  type: shell
-#  role: [fuel-plugin-manila_role]
-#  version: 2.0.0
-#  cross-depends:
-#    - name: post_deployment_start
-#  cross-depended-by:
-#    - name: post_deployment_end
-# #  requires: [post_deployment_start]
-# #  required_for: [post_deployment_end]
-#  parameters:
-#    cmd: echo post_deployment_task_executed > /tmp/post_deployment
-#    retries: 3
-#    interval: 20
-#    timeout: 180
+- id: manila-hiera
+  type: puppet
+  role: [primary-controller, controller]
+  version: 2.0.0
+  cross-depends:
+    - name: manila-start
+  cross-depended-by:
+    - name: deploy_end
+  parameters:
+    puppet_manifest: "puppet/manifests/populate_hiera.pp"
+    puppet_modules: "."
+    timeout: 3600
 
-#- id: fuel-plugin-manila-pre-deployment-sh
-#  type: shell
-#  role: [fuel-plugin-manila_role]
-#  version: 2.0.0
-#  cross-depends:
-#    - name: pre_deployment_start
-#  cross-depended-by:
-#    - name: pre_deployment_end
-# #  requires: [pre_deployment_start]
-# #  required_for: [pre_deployment_end]
-#  parameters:
-#    cmd: echo pre_deployment_task_executed > /tmp/pre_deployment
-#    retries: 3
-#    interval: 20
-#    timeout: 180
+- id: manila-keystone
+  type: puppet
+  role: [primary-controller, controller]
+  version: 2.0.0
+  cross-depends:
+    - name: manila-hiera
+  cross-depended-by:
+    - name: deploy_end
+  parameters:
+    puppet_manifest: "puppet/manifests/populate_hiera.pp"
+    puppet_modules: "."
+    timeout: 3600
+    
diff --git a/metadata.yaml b/metadata.yaml
index f6289e9..0893b7e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,7 +3,7 @@ name: fuel-plugin-manila
 # Human-readable name for your plugin
 title: Title for fuel-plugin-manila plugin
 # Plugin version
-version: '1.0.0'
+version: '1.0.1'
 # Description
 description: Please describe your plugin here
 # Required fuel version