diff --git a/projects/rocdecode/CHANGELOG.md b/projects/rocdecode/CHANGELOG.md
index 0162281bfc..10bcdc8548 100644
--- a/projects/rocdecode/CHANGELOG.md
+++ b/projects/rocdecode/CHANGELOG.md
@@ -3,6 +3,40 @@
 Documentation for rocDecode is available at
 [https://rocm.docs.amd.com/projects/rocDecode/en/latest/](https://rocm.docs.amd.com/projects/rocDecode/en/latest/)
 
+## rocDecode 0.7.0
+
+### Additions
+
+* Clang - Default CXX compiler
+
+### Optimizations
+
+* Setup Script - Build and runtime install options
+
+### Changes
+
+* CTest - Core tests for make test and package test
+
+### Fixes
+
+* Sample - Bugfix for videoDecodeBatch
+
+### Tested configurations
+
+* Linux
+  * Ubuntu - `20.04` / `22.04`
+  * RHEL - `8` / `9`
+  * SLES - `15 SP5`
+* ROCm:
+  * rocm-core - `6.2.0.60200-66`
+  * amdgpu-core - `1:6.2.60200-2009582`
+* libva-dev - `2.7.0-2` / `2.14.0-1`
+* mesa-amdgpu-va-drivers - `1:24.2.0.60200-2009582`
+* mesa-amdgpu-dri-drivers - `24.1.0.60200`
+* FFmpeg - `4.2.7` / `4.4.2-0`
+* rocDecode Setup Script - `V2.2.0`
+
+
 ## rocDecode 0.6.0
 
 ### Additions
diff --git a/projects/rocdecode/CMakeLists.txt b/projects/rocdecode/CMakeLists.txt
index 121ac65564..e0d0b4a4bb 100644
--- a/projects/rocdecode/CMakeLists.txt
+++ b/projects/rocdecode/CMakeLists.txt
@@ -22,6 +22,9 @@
 # ##############################################################################
 
 cmake_minimum_required(VERSION 3.5)
+if (NOT DEFINED CMAKE_CXX_COMPILER)
+    set(CMAKE_CXX_COMPILER clang++)
+endif()
 
 set(VERSION "0.7.0")
 set(CMAKE_CXX_STANDARD 17)
@@ -164,7 +167,7 @@ if(HIP_FOUND AND Libva_FOUND)
   # make test with CTest
   enable_testing()
   include(CTest)
-  add_subdirectory(samples)
+  add_subdirectory(test)
 
   # set package information
   set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
diff --git a/projects/rocdecode/README.md b/projects/rocdecode/README.md
index 372ae06aaa..0616aef1a7 100644
--- a/projects/rocdecode/README.md
+++ b/projects/rocdecode/README.md
@@ -16,6 +16,7 @@ access the video decoding features available on your GPU.
 * Linux distribution
   * Ubuntu - `20.04` / `22.04`
   * RHEL - `8` / `9`
+  * SLES - `15 SP5`
 
 * [ROCm-supported hardware](https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/system-requirements.html)
 > [!IMPORTANT] 
@@ -25,7 +26,7 @@ access the video decoding features available on your GPU.
 > [!IMPORTANT]
 > `sudo amdgpu-install --usecase=rocm`
 
-* [Video Acceleration API](https://en.wikipedia.org/wiki/Video_Acceleration_API) Version `1.5.0+` - `Libva` is an implementation for VA-API
+* [Video Acceleration API](https://en.wikipedia.org/wiki/Video_Acceleration_API) Version `1.5.0` or later - `Libva` is an implementation for VA-API
   ```shell
   sudo apt install libva-dev
   ```
@@ -37,12 +38,17 @@ access the video decoding features available on your GPU.
   sudo apt install mesa-amdgpu-va-drivers
   ```
 
-* CMake `3.5` or later
+* CMake Version `3.5` or later
 
   ```shell
   sudo apt install cmake
   ```
 
+* Clang Version `5.0.1` or later
+  ```shell
+  sudo apt install clang
+  ```
+
 * [pkg-config](https://en.wikipedia.org/wiki/Pkg-config)
 
   ```shell
@@ -229,11 +235,12 @@ page.
 * Linux
   * Ubuntu - `20.04` / `22.04`
   * RHEL - `8` / `9`
+  * SLES - `15 SP5`
 * ROCm:
-  * rocm-core - `6.1.0.60100-64`
-  * amdgpu-core - `1:6.1.60100-1741643`
+  * rocm-core - `6.2.0.60200-66`
+  * amdgpu-core - `1:6.2.60200-2009582`
 * libva-dev - `2.7.0-2` / `2.14.0-1`
-* mesa-amdgpu-va-drivers - `1:24.1.0`
+* mesa-amdgpu-va-drivers - `1:24.2.0.60200-2009582`
 * mesa-amdgpu-dri-drivers - `24.1.0.60200`
 * FFmpeg - `4.2.7` / `4.4.2-0`
-* rocDecode Setup Script - `V2.1.0`
+* rocDecode Setup Script - `V2.2.0`
diff --git a/projects/rocdecode/docs/install/install.rst b/projects/rocdecode/docs/install/install.rst
index 3c7969add1..5323e9d588 100644
--- a/projects/rocdecode/docs/install/install.rst
+++ b/projects/rocdecode/docs/install/install.rst
@@ -66,12 +66,18 @@ Prerequisites
 
     sudo apt install mesa-amdgpu-va-drivers
 
-* CMake 3.5 or later
+* CMake Version 3.5 or later
 
   .. code:: shell
 
     sudo apt install cmake
 
+* Clang Version `5.0.1` or later
+
+  .. code:: shell
+
+    sudo apt install clang
+
 * `pkg-config <https://en.wikipedia.org/wiki/Pkg-config>`_
 
   .. code:: shell
diff --git a/projects/rocdecode/rocDecode-setup.py b/projects/rocdecode/rocDecode-setup.py
index 3d17531664..0b30a9995c 100644
--- a/projects/rocdecode/rocDecode-setup.py
+++ b/projects/rocdecode/rocDecode-setup.py
@@ -29,7 +29,7 @@ else:
     import subprocess
 
 __copyright__ = "Copyright (c) 2023 - 2024, AMD ROCm rocDecode"
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 __email__ = "mivisionx.support@amd.com"
 __status__ = "Shipping"
 
@@ -156,6 +156,7 @@ if userName == 'root':
 # source install - common package dependencies
 commonPackages = [
     'gcc',
+    'clang',
     'cmake',
     'git',
     'wget',
diff --git a/projects/rocdecode/samples/CMakeLists.txt b/projects/rocdecode/samples/CMakeLists.txt
deleted file mode 100644
index 2a4a6c8818..0000000000
--- a/projects/rocdecode/samples/CMakeLists.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-# ##############################################################################
-# Copyright (c) 2023 - 2024 Advanced Micro Devices, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# ##############################################################################
-cmake_minimum_required(VERSION 3.5)
-
-set(ROC_VIDEO_DEC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../utils/rocvideodecode)
-# videoDecode
-add_test(
-  NAME
-    video_decode-H265
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/videoDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/videoDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "videodecode"
-            -i ${CMAKE_SOURCE_DIR}/data/videos/AMD_driving_virtual_20-H265.mp4
-)
-
-# videoDecodeMem
-add_test(
-  NAME
-    video_decodeMem-H265
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/videoDecodeMem"
-                              "${CMAKE_CURRENT_SOURCE_DIR}/videoDecodeMem"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "videodecodemem"
-            -i ${CMAKE_SOURCE_DIR}/data/videos/AMD_driving_virtual_20-H265.mp4
-)
-
-# videoDecodePerf
-add_test(
-  NAME
-    video_decodePerf-H265
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/videoDecodePerf"
-                              "${CMAKE_CURRENT_SOURCE_DIR}/videoDecodePerf"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "videodecodeperf"
-            -i ${CMAKE_SOURCE_DIR}/data/videos/AMD_driving_virtual_20-H265.mp4
-)
-
-# videoDecodeRGB
-add_test(
-  NAME
-    video_decodeRGB-H265
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/videoDecodeRGB"
-                              "${CMAKE_CURRENT_SOURCE_DIR}/videoDecodeRGB"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "videodecodergb"
-            -i ${CMAKE_SOURCE_DIR}/data/videos/AMD_driving_virtual_20-H265.mp4 -of rgb
-)
-
-# videoDecode H264
-add_test(
-  NAME
-    video_decode-H264
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/videoDecode"
-                              "${CMAKE_CURRENT_SOURCE_DIR}/videoDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "videodecode"
-            -i ${CMAKE_SOURCE_DIR}/data/videos/AMD_driving_virtual_20-H264.mp4
-)
-
-# videoDecodeBatch
-add_test(
-  NAME
-    video_decodeBatch
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/videoDecodeBatch"
-                              "${CMAKE_CURRENT_BINARY_DIR}/videoDecodeBatch"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "videodecodebatch"
-            -i ${CMAKE_SOURCE_DIR}/data/videos/ -t 2
-)
-
-# videoDecode AV1
-add_test(
-  NAME
-    video_decode-AV1
-  COMMAND
-    "${CMAKE_CTEST_COMMAND}"
-            --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/videoDecode"
-                              "${CMAKE_CURRENT_BINARY_DIR}/videoDecode"
-            --build-generator "${CMAKE_GENERATOR}"
-            --test-command "videodecode"
-            -i ${CMAKE_SOURCE_DIR}/data/videos/AMD_driving_virtual_20-AV1.mp4
-)
\ No newline at end of file