diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d7d7a22a2..68dc515b6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,16 +201,13 @@ if(HIP_FOUND AND Libva_FOUND)
   string(REGEX MATCH "Mariner" MARINER_FOUND ${OS_RELEASE})
 
   # Set the dependent packages
-  set(rocJPEG_DEBIAN_PACKAGE_LIST  "rocm-hip-runtime, libva2, libdrm-amdgpu1, mesa-amdgpu-va-drivers")
-  set(rocJPEG_RPM_PACKAGE_LIST     "rocm-hip-runtime, libva, libdrm-amdgpu, mesa-amdgpu-va-drivers, mesa-amdgpu-dri-drivers")
-  if(SLES_FOUND OR MARINER_FOUND)
-    set(rocJPEG_RPM_PACKAGE_LIST     "rocm-hip-runtime, libva2, libdrm-amdgpu, mesa-amdgpu-va-drivers, mesa-amdgpu-dri-drivers")
-  endif()
-  set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST  "rocm-hip-runtime-dev, libva-dev, pkg-config")
+  set(rocJPEG_DEBIAN_PACKAGE_LIST  "rocm-hip-runtime, libva2-amdgpu, libva-amdgpu-drm2, libva-amdgpu-wayland2, libva-amdgpu-x11-2, mesa-amdgpu-va-drivers")
+  set(rocJPEG_RPM_PACKAGE_LIST     "rocm-hip-runtime, (libva >= 2.16.0 or libva2 >= 2.16.0 or libva-amdgpu), mesa-amdgpu-va-drivers")
+  set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST  "rocm-hip-runtime-dev, libva-amdgpu-dev, pkg-config")
   if(UBUNTU_22_FOUND)
     set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "${rocJPEG_DEBIAN_DEV_PACKAGE_LIST}, libstdc++-12-dev")
   endif()
-  set(rocJPEG_RPM_DEV_PACKAGE_LIST  "rocm-hip-runtime-devel, libva-devel, pkg-config")
+  set(rocJPEG_RPM_DEV_PACKAGE_LIST  "rocm-hip-runtime-devel, libva-amdgpu-devel, pkg-config")
 
   # '%{?dist}' breaks manual builds on debian systems due to empty Provides
   execute_process(
diff --git a/README.md b/README.md
index b1cd9f824d..63912b41cf 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP
 ## Prerequisites
 
 * Linux distribution
-  * Ubuntu - `20.04` / `22.04`
+  * Ubuntu - `20.04` / `22.04` / `24.04`
   * RHEL - `8` / `9`
   * SLES - `15-SP5`
 
@@ -29,17 +29,19 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP
 > [!IMPORTANT]
 > `sudo amdgpu-install --usecase=rocm`
 
-* Video Acceleration API (VA-API) Version `1.5.0+` - `Libva` is an implementation for VA-API
+* Video Acceleration API (VA-API) Version `2.16.0+` - `Libva` is an implementation for VA-API
    ```shell
-   sudo apt install libva-dev
+   sudo apt install libva-amdgpu-dev
    ```
  > [!NOTE]
- > RPM Packages for `RHEL`/`SLES` - `libva-devel`
+ > RPM Packages for `RHEL`/`SLES` - `libva-amdgpu-devel`
 
 * AMD VA Drivers
    ```shell
-   sudo apt install mesa-amdgpu-va-drivers
+   sudo apt install libva2-amdgpu libva-amdgpu-drm2 libva-amdgpu-wayland2 libva-amdgpu-x11-2 mesa-amdgpu-va-drivers
    ```
+ > [!NOTE]
+ > RPM Packages for `RHEL`/`SLES` - `libva-amdgpu mesa-amdgpu-va-drivers`
 
 * CMake `3.5` or later
 
@@ -61,7 +63,6 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP
 >  sudo apt install libstdc++-12-dev
 >  ```
 >
-> * Additional RPM Packages required for `RHEL`/`SLES` - `libdrm-amdgpu mesa-amdgpu-dri-drivers`
 
 >[!NOTE]
 >
@@ -199,17 +200,4 @@ python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en . _build/html
 
 For more information on documentation builds, refer to the
 [Building documentation](https://rocm.docs.amd.com/en/latest/contribute/building.html)
-page.
-
-## Tested configurations
-
-* Linux
-  * Ubuntu - `20.04` / `22.04`
-  * RHEL - `8` / `9`
-* ROCm:
-  * rocm-core - `6.3.0.60300-14317`
-  * amdgpu-core - `6.3.60300-1798298`
-* libva-dev - `2.7.0-2` / `2.14.0-1`
-* mesa-amdgpu-va-drivers - `24.2.0.60300-1798298`
-* mesa-amdgpu-dri-drivers - `24.2.0.60300-1798298`
-* rocJPEG Setup Script - `V2.1.0`
\ No newline at end of file
+page.
\ No newline at end of file
diff --git a/rocJPEG-setup.py b/rocJPEG-setup.py
index 5893734940..680e79b2aa 100644
--- a/rocJPEG-setup.py
+++ b/rocJPEG-setup.py
@@ -160,36 +160,30 @@ commonPackages = [
 # Debian packages
 coreDebianPackages = [
     'rocm-hip-runtime-dev',
-    'libva2',
-    'libva-dev',
+    'libva-amdgpu-dev'
 ]
 coreDebianU22Packages = [
     'libstdc++-12-dev'
 ]
 runtimeDebianPackages = [
-    'libdrm-amdgpu1',
+    'libva2-amdgpu',
+    'libva-amdgpu-drm2',
+    'libva-amdgpu-wayland2',
+    'libva-amdgpu-x11-2',
     'mesa-amdgpu-va-drivers',
     'vainfo'
 ]
 
 # RPM Packages
-libvaNameRPM = "libva"
-if "SLES" in os_info_data or "Mariner" in os_info_data:
-    libvaNameRPM = "libva2"
 coreRPMPackages = [
     'rocm-hip-runtime-devel',
-    str(libvaNameRPM),
-    'libva-devel'
+    'libva-amdgpu-devel'
 ]
 
-libvaUtilsNameRPM = "libva-utils"
-if "Mariner" in os_info_data:
-    libvaUtilsNameRPM = "libva2" #TBD - no utils package available 
 runtimeRPMPackages = [
-    'libdrm-amdgpu',
+    'libva-amdgpu',
     'mesa-amdgpu-va-drivers',
-    'mesa-amdgpu-dri-drivers',
-    str(libvaUtilsNameRPM)
+    'libva-utils'
 ]
 
 # update