diff --git a/scripts/install_dependencies/install_NEO_OCL_driver.sh b/scripts/install_dependencies/install_NEO_OCL_driver.sh
index 6a993cf09a9..b17a8e0c364 100755
--- a/scripts/install_dependencies/install_NEO_OCL_driver.sh
+++ b/scripts/install_dependencies/install_NEO_OCL_driver.sh
@@ -329,6 +329,7 @@ _uninstall_user_mode_ubuntu()
     echo Looking for previously installed user-mode driver...
 
     PACKAGES=("intel-opencl"
+              "intel-opencl-icd"
               "intel-ocloc"
               "intel-gmmlib"
               "intel-igc-core"
@@ -656,9 +657,12 @@ check_current_driver()
         gfx_version=$(yum info intel-opencl | grep Version)
     elif [[ $DISTRO == ubuntu ]]; then
         gfx_version=$(apt show intel-opencl | grep Version)
+        if [[ -z "$gfx_version" ]]; then 
+            gfx_version=$(apt show intel-opencl-icd | grep Version)
+        fi
     fi
     
-    gfx_version="$(echo -e "${gfx_version}" | sed -e 's/^Version[[:space:]]*\:[[:space:]]*//')"
+    gfx_version="$(echo -e "${gfx_version}" | grep -Eo "[0-9]{2,3}\.[0-9]{2,3}\.[0-9]{3,6}")"
     if [[ -z "$user_chosen_driver" ]]; then
         check_specific_generation
     fi