diff --git a/deployment_scripts/puppet/manifests/install.pp b/deployment_scripts/puppet/manifests/install.pp
index 1253e39..efbaeb9 100644
--- a/deployment_scripts/puppet/manifests/install.pp
+++ b/deployment_scripts/puppet/manifests/install.pp
@@ -1,10 +1,10 @@
 notify {'MODULAR: fuel-plugin-manila/install': }
 
 $manila = hiera_hash('fuel-plugin-manila', {})
-$image  = manila['fuel-plugin-manila_image']
+$image  = $manila['fuel-plugin-manila_image']
 
 $master_ip = hiera('master_ip')
-$src_image = "wget http://${master_ip}:8080/plugins/fuel-plugin-manila-1.0/repositories/ubuntu/${image}"
+$src_image = "http://${master_ip}:8080/plugins/fuel-plugin-manila-1.0/repositories/ubuntu/${image}"
 $inits = {
   'manila-api' => {
     desc => 'manila-api init',
@@ -46,7 +46,8 @@ class {'::manila_auxiliary::fs': }
 create_resources('::manila_auxiliary::initd', $inits)
 
 class {'::manila_auxiliary::image':
-  image => $image
+  src_image => $src_image,
+  image     => $image,
 }
 
 Package['python-pip']->Package['pycrypto']->Package['python-manila']->Package['python-manilaclient']->Package['python-manila-ui']
diff --git a/deployment_scripts/puppet/manifests/populate_hiera.pp b/deployment_scripts/puppet/manifests/populate_hiera.pp
index a79ceaa..ba759f3 100644
--- a/deployment_scripts/puppet/manifests/populate_hiera.pp
+++ b/deployment_scripts/puppet/manifests/populate_hiera.pp
@@ -1,11 +1,11 @@
 notify {'MODULAR: fuel-plugin-manila/populate_hiera': }
 
-$manila        = hiera_hash('manila', {})
+$manila        = hiera_hash('manila', false)
 $fpg_manila    = hiera_hash('fuel-plugin-manila', {})
 
 $file          = '/etc/hiera/plugins/fuel-plugin-manila.yaml'
 $new_password  = generate("/bin/bash", "-c", "/bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n")
-$db_password   = generate("/bin/bash", "-c", "sleep1; /bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n")
+$db_password   = generate("/bin/bash", "-c", "sleep 1; /bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n")
 
 $image_name    = 'manila-service-image'
 $service_image = $fpg_manila['fuel-plugin-manila_image']
diff --git a/deployment_scripts/puppet/modules/manila_auxiliary/manifests/image.pp b/deployment_scripts/puppet/modules/manila_auxiliary/manifests/image.pp
index c88051e..cb63b80 100644
--- a/deployment_scripts/puppet/modules/manila_auxiliary/manifests/image.pp
+++ b/deployment_scripts/puppet/modules/manila_auxiliary/manifests/image.pp
@@ -7,7 +7,7 @@ class manila_auxiliary::image (
     source => 'puppet:///modules/manila_auxiliary/upload_cirros.rb',
   }->
   exec {'wget_service_image':
-    command => "wget ${src_image} -O /tmp/${image}"
+    command => "wget ${src_image} -O /tmp/${image}",
     path    => '/usr/bin',
   }->
   exec {'upload-service-image':
@@ -15,7 +15,7 @@ class manila_auxiliary::image (
     path    => '/usr/bin',
   }->
   exec {'del_service_image':
-    command => "rm /tmp/${image}",
+    command => "/bin/rm /tmp/${image}",
     path    => '/usr/bin',
   }
 }