diff --git a/deployment_scripts/configure_mellanox_vfs.py b/deployment_scripts/configure_mellanox_vfs.py
index d4cdca7..26bcf2d 100755
--- a/deployment_scripts/configure_mellanox_vfs.py
+++ b/deployment_scripts/configure_mellanox_vfs.py
@@ -85,7 +85,8 @@ class MellanoxVfsSettings(object):
             vf_dict['vf_num'] = count;
             vf_dict['pci_address'] = vf_info[0]
             vf_dict['port_module'] = vf_info[1]
-            vf_dict['port_num'] = vf_info[12]
+            index_port_num = vf_info.index("port")
+            vf_dict['port_num'] = vf_info[index_port_num + 1]
             vf_dict['mac'] = mac_list[count]
             cls.mellanox_vfs.append(vf_dict)
             count += 1;
diff --git a/metadata.yaml b/metadata.yaml
index 9c87295..1e92dd0 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: mellanox-plugin
 title: Mellanox ConnectX-4 Openstack Features
 
 # Plugin version
-version: 3.1.17
+version: 3.1.18
 
 # Description
 description: Enable features over Mellanox ConnectX-4 Adapters