diff --git a/unified-runtime/cmake/FetchOpenCL.cmake b/unified-runtime/cmake/FetchOpenCL.cmake
index a2384252f431b..3f662bafe794c 100644
--- a/unified-runtime/cmake/FetchOpenCL.cmake
+++ b/unified-runtime/cmake/FetchOpenCL.cmake
@@ -14,8 +14,8 @@ set(OCL_LOADER_REPO
 
 # Repo tags/hashes
 
-set(OCL_HEADERS_TAG 6eabe90aa7b6cff9c67800a2fe25a0cd88d8b749)
-set(OCL_LOADER_TAG ddf6c70230a79cdb8fcccfd3c775b09e6820f42e)
+set(OCL_HEADERS_TAG v2025.07.22)
+set(OCL_LOADER_TAG v2025.07.22)
 
 # Set NO_CMAKE_PACKAGE_REGISTRY so only system-wide installs are
 # detected.
diff --git a/unified-runtime/source/adapters/opencl/memory.cpp b/unified-runtime/source/adapters/opencl/memory.cpp
index 394af5f441a85..3507c003db0b0 100644
--- a/unified-runtime/source/adapters/opencl/memory.cpp
+++ b/unified-runtime/source/adapters/opencl/memory.cpp
@@ -208,6 +208,8 @@ cl_image_format mapURImageFormatToCL(const ur_image_format_t *PImageFormat) {
 
 cl_image_desc mapURImageDescToCL(const ur_image_desc_t *PImageDesc) {
   cl_image_desc CLImageDesc;
+  memset(&CLImageDesc, 0, sizeof(CLImageDesc));
+
   CLImageDesc.image_type = static_cast<cl_mem_object_type>(PImageDesc->type);
 
   switch (PImageDesc->type) {
@@ -239,8 +241,6 @@ cl_image_desc mapURImageDescToCL(const ur_image_desc_t *PImageDesc) {
   CLImageDesc.image_slice_pitch = PImageDesc->slicePitch;
   CLImageDesc.num_mip_levels = PImageDesc->numMipLevel;
   CLImageDesc.num_samples = PImageDesc->numSamples;
-  CLImageDesc.buffer = nullptr;
-  CLImageDesc.mem_object = nullptr;
 
   return CLImageDesc;
 }