diff --git a/deployment_scripts/puppet/manifests/cinder.pp b/deployment_scripts/puppet/manifests/controller.pp
similarity index 93%
rename from deployment_scripts/puppet/manifests/cinder.pp
rename to deployment_scripts/puppet/manifests/controller.pp
index 9728174..6607759 100755
--- a/deployment_scripts/puppet/manifests/cinder.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -14,4 +14,4 @@
 #    under the License.
 #
 
-include plugin_purestorage_cinder::cinder
+include plugin_purestorage_cinder::controller
diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/cinder.pp b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
similarity index 94%
rename from deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/cinder.pp
rename to deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
index 471e08e..d564462 100755
--- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/cinder.pp
+++ b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
@@ -13,7 +13,7 @@
 #    under the License.
 #
 
-class plugin_purestorage_cinder::cinder (
+class plugin_purestorage_cinder::controller (
     $backend_name  = 'pure',
     $backends      = ''
 ) {
@@ -27,6 +27,10 @@ class plugin_purestorage_cinder::cinder (
       provider => pip
     }
 
+    cinder_config {
+      "DEFAULT/host": value => "str:pure";
+    }
+
     $plugin_settings = hiera('fuel-plugin-purestorage-cinder')
 
     if $::cinder::params::volume_package {
diff --git a/docs/purestorage-cinder-guide.rst b/docs/purestorage-cinder-guide.rst
index 8e4aba5..8965e15 100644
--- a/docs/purestorage-cinder-guide.rst
+++ b/docs/purestorage-cinder-guide.rst
@@ -82,7 +82,7 @@ Pure Storage Cinder Plugin installation
 
 #. Enter the Purity API Token and the IP address of the management VIP of the Pure Storage FlashArray.
 
-#. Select the defaults for all other Pure Storage options.
+#. Select the values for all other Pure Storage options.
 
 User Guide
 ==========
diff --git a/fuel-plugin-purestorage-cinder-2.0-2.0.0-1.noarch.rpm b/fuel-plugin-purestorage-cinder-2.0-2.0.0-1.noarch.rpm
index 3292d45..3c10515 100644
Binary files a/fuel-plugin-purestorage-cinder-2.0-2.0.0-1.noarch.rpm and b/fuel-plugin-purestorage-cinder-2.0-2.0.0-1.noarch.rpm differ
diff --git a/tasks.yaml b/tasks.yaml
index 15e57cb..fb1cff9 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,9 +1,9 @@
 # Deployment tasks
-- role: [cinder]
+- role: [primary-controller, controller]
   stage: post_deployment/6000
   type: puppet
   parameters:
-    puppet_manifest: puppet/manifests/cinder.pp
+    puppet_manifest: puppet/manifests/controller.pp
     puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
     timeout: 360