diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt
index e123df4914..ca7a54041f 100644
--- a/opencl/CMakeLists.txt
+++ b/opencl/CMakeLists.txt
@@ -71,19 +71,14 @@ execute_process(COMMAND git show -s --format=@%ct
     OUTPUT_VARIABLE OPENCL_VERSION_GITDATE
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-# get commit short hash
-execute_process(COMMAND git rev-parse --short HEAD
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-    OUTPUT_VARIABLE OPENCL_VERSION_GITHASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-set(OPENCL_VERSION_MAJOR "2")
-set(OPENCL_VERSION_MINOR "0")
-set(OPENCL_VERSION_PATCH ${OPENCL_VERSION_GITDATE})
-
 get_target_property(OPENCL_LIB_VERSION_MAJOR OpenCL SOVERSION)
 get_target_property(OPENCL_LIB_VERSION_STRING OpenCL VERSION)
 
+find_package(ROCM QUIET CONFIG PATHS /opt/rocm)
+include(ROCMSetupVersion)
+
+rocm_setup_version( VERSION "2.0.0" )
+
 ###--- Packaging ------------------------------------------------------------###
 
 # MAIN package
@@ -159,8 +154,8 @@ if(POLICY CMP0037)
     cmake_policy(SET CMP0037 OLD)
 endif()
 file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/fixnames
-	CONTENT "pwd; for i in *.deb; do mv \"\$i\" \"\${i/.deb/-${OPENCL_VERSION_GITHASH}-amd64.deb}\" ; done
-	for i in *.rpm ; do mv \"\$i\" \"\${i/.rpm/-${OPENCL_VERSION_GITHASH}.x86_64.rpm}\" ; done
+	CONTENT "pwd; for i in *.deb; do mv \"\$i\" \"\${i/.deb/-amd64.deb}\" ; done
+	for i in *.rpm ; do mv \"\$i\" \"\${i/.rpm/.x86_64.rpm}\" ; done
 ")
 add_custom_target(package
     COMMAND bash ${PROJECT_BINARY_DIR}/fixnames
diff --git a/opencl/packaging/rocm-opencl-dev.txt b/opencl/packaging/rocm-opencl-dev.txt
index 37b7955d8c..ebc8af7149 100644
--- a/opencl/packaging/rocm-opencl-dev.txt
+++ b/opencl/packaging/rocm-opencl-dev.txt
@@ -19,10 +19,7 @@ set(CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc.")
 set(CPACK_PACKAGE_VENDOR "AMD")
 set(CPACK_PACKAGING_INSTALL_PREFIX @CPACK_PACKAGING_INSTALL_PREFIX@)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCL: Open Computing Language on ROCclr")
-set(CPACK_PACKAGE_VERSION_MAJOR @OPENCL_VERSION_MAJOR@)
-set(CPACK_PACKAGE_VERSION_MINOR @OPENCL_VERSION_MINOR@)
-set(CPACK_PACKAGE_VERSION_PATCH @OPENCL_VERSION_PATCH@)
-set(CPACK_PACKAGE_VERSION @OPENCL_VERSION_MAJOR@.@OPENCL_VERSION_MINOR@.@OPENCL_VERSION_PATCH@)
+set(CPACK_PACKAGE_VERSION @PROJECT_VERSION@)
 set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
 
 # Debian CPACK variables
diff --git a/opencl/packaging/rocm-opencl.txt b/opencl/packaging/rocm-opencl.txt
index 465ec2eb9e..d637c5f66d 100644
--- a/opencl/packaging/rocm-opencl.txt
+++ b/opencl/packaging/rocm-opencl.txt
@@ -17,10 +17,7 @@ set(CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc.")
 set(CPACK_PACKAGE_VENDOR "AMD")
 set(CPACK_PACKAGING_INSTALL_PREFIX @CPACK_PACKAGING_INSTALL_PREFIX@)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCL: Open Computing Language on ROCclr")
-set(CPACK_PACKAGE_VERSION_MAJOR @OPENCL_VERSION_MAJOR@)
-set(CPACK_PACKAGE_VERSION_MINOR @OPENCL_VERSION_MINOR@)
-set(CPACK_PACKAGE_VERSION_PATCH @OPENCL_VERSION_PATCH@)
-set(CPACK_PACKAGE_VERSION @OPENCL_VERSION_MAJOR@.@OPENCL_VERSION_MINOR@.@OPENCL_VERSION_PATCH@)
+set(CPACK_PACKAGE_VERSION @PROJECT_VERSION@)
 set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
 
 # Debian CPACK variables