diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8700dd87a..85a6d7d3cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -409,10 +409,6 @@ option(HAVE_TBX_SERVER "Compile TBX server from TbxAccess library" OFF)
 option(USE_CL_CACHE "Use OpenCL program binary cache" ON)
 set(CL_CACHE_LOCATION "cl_cache" CACHE STRING "OpenCL program binary cache location")
 
-if(NOT NEO_DRIVER_VERSION)
-  set(NEO_DRIVER_VERSION 1.0)
-endif()
-
 # Put profiling enable flag into define
 if(OCL_RUNTIME_PROFILING)
 	add_definitions(-DOCL_RUNTIME_PROFILING=${OCL_RUNTIME_PROFILING})
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 0965852db2..67662e60e3 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -17,7 +17,7 @@ components:
     branch: infra
     clean_on_sync: true
     dest_dir: infra
-    revision: d41c5e24ce6b26cdf5d3ac0f7ddcbc899d15a3e5
+    revision: 7f97ae0f092f3729eca0485b31d782fc31c04ed0
     type: git
   internal:
     branch: master
diff --git a/version.cmake b/version.cmake
index 2218086f67..a6d35b962a 100644
--- a/version.cmake
+++ b/version.cmake
@@ -62,6 +62,18 @@ if(UNIX)
   if(NOT DEFINED NEO_VERSION_BUILD)
     set(NEO_VERSION_BUILD 0)
   endif()
+else()
+  if(NOT DEFINED NEO_VERSION_MAJOR)
+    set(NEO_VERSION_MAJOR 1)
+  endif()
 
-  set(NEO_DRIVER_VERSION "${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_VERSION_BUILD}")
+  if(NOT DEFINED NEO_VERSION_MINOR)
+    set(NEO_VERSION_MINOR 0)
+  endif()
+
+  if(NOT DEFINED NEO_VERSION_BUILD)
+    set(NEO_VERSION_BUILD 0)
+  endif()
 endif(UNIX)
+
+set(NEO_DRIVER_VERSION "${NEO_VERSION_MAJOR}.${NEO_VERSION_MINOR}.${NEO_VERSION_BUILD}")