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 6df1198..8fe6b28 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
@@ -12,6 +12,11 @@ class mellanox_openstack::cinder_iser (
   cinder_config { 'DEFAULT/iscsi_ip_address' :
     value => "$iser_ip_address"
   }
+
+  cinder_config { 'LVM-backend/iscsi_protocol' :
+    value => 'iser'
+  }
+
   service { $cinder::params::volume_service :
     ensure    => running,
     subscribe => [Cinder_config['DEFAULT/iscsi_protocol'],
diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp
index 5dc3fab..95b888e 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp
@@ -14,15 +14,15 @@ class mellanox_openstack::params {
       $libvirt_driver_file      = '/usr/lib/python2.6/site-packages/nova/virt/libvirt/driver.py'
     }
     'Debian': {
-      $neutron_mlnx_packages_compute    = ['neutron-plugin-mlnx','neutron-plugin-mlnx-agent', 'python-networking-mlnx']
+      $neutron_mlnx_packages_compute    = ['neutron-plugin-mlnx','neutron-mlnx-agent', 'python-networking-mlnx']
       $neutron_mlnx_packages_controller = ['python-networking-mlnx']
-      $agent_service                    = ['neutron-plugin-mlnx-agent']
-      $sriov_agent_service_name         = 'neutron-plugin-sriov-agent'
-      $sriov_agent_package_name         = 'neutron-plugin-sriov-agent'
+      $agent_service                    = ['neutron-mlnx-agent']
+      $sriov_agent_service_name         = 'neutron-sriov-agent'
+      $sriov_agent_package_name         = 'neutron-sriov-agent'
       $compute_service_name             = 'nova-compute'
       $openvswitch_mgmt_service         = 'openvswitch-switch'
       $libvirt_driver_file              = '/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py'
-      $mlnx_agent_init_file             = '/etc/init/neutron-plugin-mlnx-agent.conf'
+      $mlnx_agent_init_file             = '/etc/init/neutron-mlnx-agent.conf'
     }
   }
 
diff --git a/metadata.yaml b/metadata.yaml
index 85f425b..e7ffd21 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,13 +5,13 @@ name: mellanox-plugin
 title: Mellanox ConnectX-4 Openstack Features
 
 # Plugin version
-version: 3.2.1
+version: 3.3.0
 
 # Description
 description: Enable features over Mellanox ConnectX-4 Adapters
 
 # Required fuel version
-fuel_version: ['8.0']
+fuel_version: ['8.0','9.0']
 
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
@@ -32,6 +32,12 @@ releases:
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
+  - os: ubuntu
+    version: mitaka-9.0
+    mode: ['ha']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/ubuntu
+
 
 # Version of plugin package
 package_version: '3.0.0'
diff --git a/scripts/common b/scripts/common
index 82bc4cd..e2cf130 100644
--- a/scripts/common
+++ b/scripts/common
@@ -1,6 +1,6 @@
 MELLANOX_PLUGIN_NAME="mellanox-plugin-*"
 PLUGIN_SCRIPTS_DIR=`echo /var/www/nailgun/plugins/$MELLANOX_PLUGIN_NAME/scripts/`
-FUEL_BOOTSTRAP_DIR="/var/www/nailgun/bootstrap/"
+FUEL_BOOTSTRAP_DIR="/var/www/nailgun/bootstrap*/"
 ORIG_BOOTSTRAP_VERSION_FILE="/opt/orig_bootstrap.txt"
 BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml"
 ORIG_BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml.orig"