diff --git a/deployment_scripts/mellanox_settings.py b/deployment_scripts/mellanox_settings.py
index ff20a46..7c5d560 100755
--- a/deployment_scripts/mellanox_settings.py
+++ b/deployment_scripts/mellanox_settings.py
@@ -201,6 +201,7 @@ class MellanoxSettings(object):
             'bridge': 'br-storage',
             'name': storage_parent,
         })
+        endpoints['br-storage'] = {'IP' : 'None'}
 
     @classmethod
     def get_endpoints_section(cls):
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 8a0b3cb..6df1198 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
@@ -12,16 +12,10 @@ class mellanox_openstack::cinder_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 c354959..bf888be 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox Openstack features
 
 # Plugin version
-version: 2.0.22
+version: 2.0.23
 
 # Description
 description: Enable features over Mellanox hardware