diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index 5d69902..145cf70 100755
--- a/deployment_scripts/puppet/manifests/controller.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -14,13 +14,9 @@
 #    under the License.
 #
 $plugin_settings = hiera('fuel-plugin-purestorage-cinder')
-$backend_name = 'pure'
-$previous_backends = ''
 
 class { 'plugin_purestorage_cinder::controller' :
-  backend_name   => $backend_name,
-  backends  => $previous_backends,
-  multibackend => $plugin_settings['multibackend'],
+  section   => 'pure',
   glance_image_cache => $plugin_settings['pure_glance_image_cache'],
   glance_image_count => $plugin_settings["pure_glance_cache_count"],
   glance_image_size => $plugin_settings["pure_glance_cache_size"],
diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
index a715937..74d83aa 100755
--- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
+++ b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
@@ -14,9 +14,7 @@
 #
 
 class plugin_purestorage_cinder::controller (
-    $backend_name,
-    $backends,
-    $multibackend,
+    $section,
     $glance_image_cache,
     $glance_image_count,
     $glance_image_size,
@@ -58,6 +56,16 @@ class plugin_purestorage_cinder::controller (
     include ::cinder::client
     include ::keystone::client
 
+    ini_subsetting {'enable_cinder_pure_backend':
+      ensure             => present,
+      section            => 'DEFAULT',
+      key_val_separator  => '=',
+      path               => '/etc/cinder/cinder.conf',
+      setting            => 'enabled_backends',
+      subsetting         => "${section}",
+      subsetting_separator => ',',
+    }
+
     package {"purestorage":
       ensure => "installed",
       provider => pip
@@ -70,18 +78,14 @@ class plugin_purestorage_cinder::controller (
       Package[$::cinder::params::volume_package] -> Cinder_config<||>
     }
 
-    if $multibackend{
-      $section = $backend_name
-      cinder_type {'pure_vol':
-        ensure => present,
-        properties => ['volume_backend_name=$section'],
-      }
-      cinder_config {
-        "DEFAULT/default_volume_type": value => 'pure_vol';
-        "DEFAULT/enabled_backends": value => "${backend_name}";
-      }
-    } else {
-      $section = 'DEFAULT'
+#    $section = $backend_name
+    cinder_type {'pure_vol':
+      ensure => present,
+      properties => ['volume_backend_name=pure'],
+    }
+    cinder_config {
+      "DEFAULT/default_volume_type": value => 'pure_vol';
+#      "DEFAULT/enabled_backends": value => "${section}";
     }
 
     if $glance_image_cache{
diff --git a/doc/source/_static/cinder-purestorage-mitaka-plugin-1.png b/doc/source/_static/cinder-purestorage-mitaka-plugin-1.png
index fb6ae63..a5eb1ee 100644
Binary files a/doc/source/_static/cinder-purestorage-mitaka-plugin-1.png and b/doc/source/_static/cinder-purestorage-mitaka-plugin-1.png differ
diff --git a/environment_config.yaml b/environment_config.yaml
index a2854c1..017da06 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -1,12 +1,6 @@
 attributes:
   metadata:
     group: 'storage'
-  multibackend:
-    value: true
-    label: 'Multi-backend enabled'
-    description: 'Pure Storage will be used in a multi-backend environment'
-    weight: 10
-    type: "checkbox"
   pure_cg:
     value: "false"
     values:
diff --git a/metadata.yaml b/metadata.yaml
index 9104094..8ee5c35 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,7 +7,7 @@ licenses: ['Apache License Version 2.0']
 authors: ['Simon Dodsley <simon@purestorage.com>']
 homepage: 'https://github.com/openstack/fuel-plugin-purestorage-cinder'
 groups: ['storage::cinder']
-is_hotpluggable: false
+is_hotpluggable: true
 
 releases:
   - os: ubuntu