diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
index 8ee7e72..8a0b3cb 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
@@ -3,26 +3,25 @@ class mellanox_openstack::cinder_iser (
 ) {
   include cinder::params
 
-  class { 'mellanox_openstack::cinder::cinder_conf' :
-    iser_ip_address => $iser_ip_address,
-  } ~>
-  service { $cinder::params::volume_service :
-    ensure => running
-  }
-}
-
-class mellanox_openstack::cinder::cinder_conf (
-  $iser_ip_address,
-) {
-  include cinder::params
-  include mellanox_openstack::params
-
   cinder_config { 'DEFAULT/volume_driver' :
-    value => 'cinder.volume.drivers.lvm.LVMISERDriver'
+    value => 'cinder.volume.drivers.lvm.LVMVolumeDriver'
   }
-  cinder_config { 'DEFAULT/iser_ip_address' :
-    value => $iser_ip_address
+  cinder_config { 'DEFAULT/iscsi_protocol' :
+    value => 'iser'
+  }
+  cinder_config { 'DEFAULT/iscsi_ip_address' :
+    value => "$iser_ip_address"
+  }
+  exec { 'flush_br_storage' :
+    command => "ip addr flush dev br-storage",
+    onlyif  => "ip a | grep -q br-storage",
+    path    => ['/bin', '/sbin']
+  }
+  service { $cinder::params::volume_service :
+    ensure    => running,
+    subscribe => [Cinder_config['DEFAULT/iscsi_protocol'],
+                  Cinder_config['DEFAULT/volume_driver'],
+                  Exec['flush_br_storage'],
+                  Cinder_config['DEFAULT/iscsi_ip_address']]
   }
 }
-
-
diff --git a/metadata.yaml b/metadata.yaml
index ed7268b..c354959 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox Openstack features
 
 # Plugin version
-version: 2.0.21
+version: 2.0.22
 
 # Description
 description: Enable features over Mellanox hardware