diff --git a/deployment_scripts/configure_mellanox_vfs.py b/deployment_scripts/configure_mellanox_vfs.py
index b6d31b1..d4cdca7 100755
--- a/deployment_scripts/configure_mellanox_vfs.py
+++ b/deployment_scripts/configure_mellanox_vfs.py
@@ -20,8 +20,11 @@ import subprocess
 import logging
 import traceback
 import glob
+import time
 
 LOG_FILE = '/var/log/mellanox-plugin.log'
+DRIVER_SLEEP_INTERVAL = 5
+MAX_DRIVER_TRIALS = 5
 
 class MellanoxVfsSettingsException(Exception):
     pass
@@ -156,17 +159,18 @@ class MellanoxVfsSettings(object):
                  sys.exit(1)
 
     @classmethod
-    def wait_for_mlx_modules_and_vfs_loaded(cls, total_vfs):
-        retval = 1
-        while (retval != 0):
-            cmd_lsmod = "lsmod | grep mlx_compat"
-            p_lsmod = subprocess.Popen(cmd_lsmod, shell=True,stdout=subprocess.PIPE,
-                                       stderr=subprocess.STDOUT)
-            retval = p_lsmod.wait()
-        logging.info("mlx_compat module is loaded!")
-
+    def wait_for_vfs_loaded(cls, total_vfs):
+        count = 0
         number_of_vfs = 0
         while ( number_of_vfs != total_vfs):
+            if count == MAX_DRIVER_TRIALS :
+                logging.error("VFs loading timeout: waited for {0}".format(
+                              MAX_DRIVER_TRIALS * DRIVER_SLEEP_INTERVAL) + \
+                              "sec and number of vfs loaded is not correct")
+                sys.exit(1)
+            else:
+                time.sleep(DRIVER_SLEEP_INTERVAL)
+
             cmd_number_vfs = "lspci | grep -i mellanox | grep -i virtual | wc -l"
             p_number_vfs = subprocess.Popen(cmd_number_vfs, shell=True,stdout=subprocess.PIPE,
                                             stderr=subprocess.STDOUT)
@@ -175,6 +179,7 @@ class MellanoxVfsSettings(object):
                 logging.error("Failed to run lspci")
                 sys.exit(1)
             number_of_vfs = int(p_number_vfs.stdout.readlines()[0].rstrip());
+            count += 1
         logging.info("all VFs are loaded.")
 
 def main(total_vfs):
@@ -182,7 +187,7 @@ def main(total_vfs):
                         level=logging.DEBUG, filename=LOG_FILE)
     try:
         vfs_configurations = MellanoxVfsSettings()
-        vfs_configurations.wait_for_mlx_modules_and_vfs_loaded(int(total_vfs))
+        vfs_configurations.wait_for_vfs_loaded(int(total_vfs))
         vfs_configurations.build_vfs_dict()
         vfs_configurations.assign_mac_per_vf()
         vfs_configurations.unbind()
diff --git a/deployment_scripts/post_set_mellanox_interfaces.sh b/deployment_scripts/post_set_mellanox_interfaces.sh
index 88e72e8..3eba8aa 100755
--- a/deployment_scripts/post_set_mellanox_interfaces.sh
+++ b/deployment_scripts/post_set_mellanox_interfaces.sh
@@ -40,9 +40,9 @@ if ([[ $ROLES == *compute* ]] && [[ ! $ROLES == "compute" ]]) \
     fi
   fi
   if [ $CX == 'ConnectX-4' ]; then
-    service openibd restart && service openvswitch-switch restart
-    #sleep 10
+    logger_print info "Skipping post_set_mellanox_interfaces in ConnectX-4"
   fi
+
   # Verify VFs
   ./sriov.sh validate
 
diff --git a/deployment_scripts/sriov.sh b/deployment_scripts/sriov.sh
index 22048ef..1e9b904 100755
--- a/deployment_scripts/sriov.sh
+++ b/deployment_scripts/sriov.sh
@@ -305,6 +305,7 @@ function set_sriov () {
       echo "#!/bin/bash" > $persistent_ifup_script
       chmod +x $persistent_ifup_script
       echo "if ! lspci | grep -i mellanox | grep -i virtual; then" >> $persistent_ifup_script
+      echo "echo 0 > /sys/class/net/${device_up}/device/mlx5_num_vfs" >> $persistent_ifup_script
       echo "echo ${TOTAL_VFS} > /sys/class/net/${device_up}/device/mlx5_num_vfs" >> $persistent_ifup_script
       echo "python /etc/fuel/plugins/mellanox-plugin-*/configure_mellanox_vfs.py ${TOTAL_VFS}" >> $persistent_ifup_script
       echo "fi" >> $persistent_ifup_script