diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2
index 0f673249a..558b9aa12 100644
--- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2
+++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2
@@ -172,6 +172,11 @@ function cleanup()
     local -i max_retry=99
 	
     if [ "$NODESETSTATE" != "genimage" ]; then
+        # Clean up the uname hacking
+        if [ -f "/bin/uname.save" ]; then
+            mv -f "/bin/uname.save" "/bin/uname"
+        fi
+
         if mount | grep -q "/tmp/ofed/mountpoint"; then
             while ! umount "/tmp/ofed/mountpoint"
             do
@@ -294,6 +299,10 @@ EOF
         fi
         echo "[OK]"
 
+        if [ "$NODESETSTATE" = "install" ]; then
+            hack_uname
+        fi
+
         echo "Start Mellanox OFED installation ........."
         env -i "PATH=${PATH}" /tmp/ofed/mountpoint/mlnxofedinstall "${MLNXOFED_OPTS[@]}"