diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/compute_sriov.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/compute_sriov.pp
index 7eb79bf..9e6dfd2 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/compute_sriov.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/compute_sriov.pp
@@ -14,7 +14,7 @@ class mellanox_openstack::compute_sriov (
   $libvirt_service_name = 'libvirtd'
   $libvirt_package_name = $nova::params::libvirt_package_name
 
-  $path_to_generate_pci_script = generate ("/bin/bash", "-c", 'echo /etc/fuel/plugins/mellanox-plugin-*.0/generate_pci_passthrough_whitelist.py | tr -d \'\n \' ')
+  $path_to_generate_pci_script = generate ("/bin/bash", "-c", 'echo /etc/fuel/plugins/mellanox-plugin-*/generate_pci_passthrough_whitelist.py | tr -d \'\n \' ')
   $pci_passthrough_addresses = generate ("/usr/bin/python", $path_to_generate_pci_script, $exclude_vf, $physnet, $physifc)
 
   # configure pci_passthrough_whitelist nova compute
diff --git a/metadata.yaml b/metadata.yaml
index 86bfb52..cf2501f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox Openstack features
 
 # Plugin version
-version: 2.0.33
+version: 2.0.34
 
 # Description
 description: Enable features over Mellanox hardware
diff --git a/scripts/common b/scripts/common
index 21289d7..82bc4cd 100644
--- a/scripts/common
+++ b/scripts/common
@@ -1,5 +1,5 @@
-MELLANOX_PLUGIN_NAME="mellanox-plugin-2.0"
-PLUGIN_SCRIPTS_DIR="/var/www/nailgun/plugins/$MELLANOX_PLUGIN_NAME/scripts/"
+MELLANOX_PLUGIN_NAME="mellanox-plugin-*"
+PLUGIN_SCRIPTS_DIR=`echo /var/www/nailgun/plugins/$MELLANOX_PLUGIN_NAME/scripts/`
 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"
diff --git a/scripts/create_mellanox_vpi_bootstrap b/scripts/create_mellanox_vpi_bootstrap
index b994407..5e5bdb5 100755
--- a/scripts/create_mellanox_vpi_bootstrap
+++ b/scripts/create_mellanox_vpi_bootstrap
@@ -3,8 +3,12 @@
 import yaml
 import os
 import time
+import subprocess
+import sys
 
-plugin = "mellanox-plugin-2.0"
+plugin = subprocess.Popen("echo /var/www/nailgun/plugins/mellanox-plugin-*/ " +
+                          "| tr '/' '\n' | grep mellanox-plugin | tr -d '\n' ", 
+                          shell=True, stdout=subprocess.PIPE).stdout.read()
 plugin_uri = "http://127.0.0.1:8080/plugins/%s/repositories/ubuntu/" % plugin
 current_time = time.strftime("%d_%m_%y_%H_%M")