diff --git a/unified-runtime/source/adapters/cuda/enqueue.cpp b/unified-runtime/source/adapters/cuda/enqueue.cpp
index 5b75c1ea927e6..73fc4b298d93b 100644
--- a/unified-runtime/source/adapters/cuda/enqueue.cpp
+++ b/unified-runtime/source/adapters/cuda/enqueue.cpp
@@ -1682,7 +1682,7 @@ urEnqueueUSMAdvise(ur_queue_handle_t hQueue, const void *pMem, size_t size,
   UR_CHECK_ERROR(cuPointerGetAttribute(
       &IsManaged, CU_POINTER_ATTRIBUTE_IS_MANAGED, (CUdeviceptr)pMem));
   if (!IsManaged) {
-    logger::warning(
+    UR_LOG(WARN, 
         "Memory advice ignored as memory advices only works with USM.");
     return UR_RESULT_SUCCESS;
   }
diff --git a/unified-runtime/source/adapters/level_zero/adapter.cpp b/unified-runtime/source/adapters/level_zero/adapter.cpp
index c38d431ab05bb..6ec844cbef3ea 100644
--- a/unified-runtime/source/adapters/level_zero/adapter.cpp
+++ b/unified-runtime/source/adapters/level_zero/adapter.cpp
@@ -423,7 +423,7 @@ ur_adapter_handle_t_::ur_adapter_handle_t_()
         if ((loader_version.major == 1 && loader_version.minor < 21) ||
             (loader_version.major == 1 && loader_version.minor == 21 &&
              loader_version.patch < 2)) {
-          logger::warning(
+          UR_LOG(WARN, 
               "WARNING: Level Zero Loader version is older than 1.21.2. "
               "Please update to the latest version for API logging support.\n");
         }
diff --git a/unified-runtime/source/adapters/opencl/enqueue.cpp b/unified-runtime/source/adapters/opencl/enqueue.cpp
index 67f1dcde6d783..d1e9212086010 100644
--- a/unified-runtime/source/adapters/opencl/enqueue.cpp
+++ b/unified-runtime/source/adapters/opencl/enqueue.cpp
@@ -72,7 +72,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
                                     : compiledLocalWorksize.data(),
       numEventsInWaitList, CLWaitEvents.data(), ifUrEvent(phEvent, Event));
   if (Err == CL_INVALID_KERNEL_ARGS) {
-    ur::cl::getAdapter()->log.error("Kernel called with invalid arguments");
+    UR_LOG_L(ur::cl::getAdapter()->log, ERR, "Kernel called with invalid arguments");
   }
   CL_RETURN_ON_FAILURE(Err);
 
diff --git a/unified-runtime/source/loader/layers/tracing/ur_trcddi.cpp b/unified-runtime/source/loader/layers/tracing/ur_trcddi.cpp
index a93f8bdb66e13..18759313d67c0 100644
--- a/unified-runtime/source/loader/layers/tracing/ur_trcddi.cpp
+++ b/unified-runtime/source/loader/layers/tracing/ur_trcddi.cpp
@@ -7186,7 +7186,7 @@ urBindlessImagesGetImageMemoryHandleTypeSupportExp(
       "urBindlessImagesGetImageMemoryHandleTypeSupportExp", &params);
 
   auto &logger = getContext()->logger;
-  logger.info("   ---> urBindlessImagesGetImageMemoryHandleTypeSupportExp\n");
+  UR_LOG_L(logger, INFO, "   ---> urBindlessImagesGetImageMemoryHandleTypeSupportExp\n");
 
   ur_result_t result = pfnGetImageMemoryHandleTypeSupportExp(
       hContext, hDevice, pImageDesc, pImageFormat, imageMemHandleType,
@@ -7203,7 +7203,7 @@ urBindlessImagesGetImageMemoryHandleTypeSupportExp(
         args_str,
         UR_FUNCTION_BINDLESS_IMAGES_GET_IMAGE_MEMORY_HANDLE_TYPE_SUPPORT_EXP,
         &params);
-    logger.info(
+    UR_LOG_L(logger, INFO, 
         "   <--- urBindlessImagesGetImageMemoryHandleTypeSupportExp({}) -> "
         "{};\n",
         args_str.str(), result);
@@ -7245,7 +7245,7 @@ urBindlessImagesGetImageUnsampledHandleSupportExp(
       "urBindlessImagesGetImageUnsampledHandleSupportExp", &params);
 
   auto &logger = getContext()->logger;
-  logger.info("   ---> urBindlessImagesGetImageUnsampledHandleSupportExp\n");
+  UR_LOG_L(logger, INFO, "   ---> urBindlessImagesGetImageUnsampledHandleSupportExp\n");
 
   ur_result_t result = pfnGetImageUnsampledHandleSupportExp(
       hContext, hDevice, pImageDesc, pImageFormat, imageMemHandleType,
@@ -7262,7 +7262,7 @@ urBindlessImagesGetImageUnsampledHandleSupportExp(
         args_str,
         UR_FUNCTION_BINDLESS_IMAGES_GET_IMAGE_UNSAMPLED_HANDLE_SUPPORT_EXP,
         &params);
-    logger.info("   <--- urBindlessImagesGetImageUnsampledHandleSupportExp({}) "
+    UR_LOG_L(logger, INFO, "   <--- urBindlessImagesGetImageUnsampledHandleSupportExp({}) "
                 "-> {};\n",
                 args_str.str(), result);
   }
@@ -7303,7 +7303,7 @@ urBindlessImagesGetImageSampledHandleSupportExp(
       "urBindlessImagesGetImageSampledHandleSupportExp", &params);
 
   auto &logger = getContext()->logger;
-  logger.info("   ---> urBindlessImagesGetImageSampledHandleSupportExp\n");
+  UR_LOG_L(logger, INFO, "   ---> urBindlessImagesGetImageSampledHandleSupportExp\n");
 
   ur_result_t result = pfnGetImageSampledHandleSupportExp(
       hContext, hDevice, pImageDesc, pImageFormat, imageMemHandleType,
@@ -7320,7 +7320,7 @@ urBindlessImagesGetImageSampledHandleSupportExp(
         args_str,
         UR_FUNCTION_BINDLESS_IMAGES_GET_IMAGE_SAMPLED_HANDLE_SUPPORT_EXP,
         &params);
-    logger.info(
+    UR_LOG_L(logger, INFO, 
         "   <--- urBindlessImagesGetImageSampledHandleSupportExp({}) -> {};\n",
         args_str.str(), result);
   }
diff --git a/unified-runtime/source/loader/layers/validation/ur_valddi.cpp b/unified-runtime/source/loader/layers/validation/ur_valddi.cpp
index 50ef552679eee..cfa5808f34944 100644
--- a/unified-runtime/source/loader/layers/validation/ur_valddi.cpp
+++ b/unified-runtime/source/loader/layers/validation/ur_valddi.cpp
@@ -7985,12 +7985,12 @@ urBindlessImagesGetImageMemoryHandleTypeSupportExp(
 
   if (getContext()->enableLifetimeValidation &&
       !getContext()->refCountContext->isReferenceValid(hContext)) {
-    getContext()->refCountContext->logInvalidReference(hContext);
+    URLOG_CTX_INVALID_REFERENCE(hContext);
   }
 
   if (getContext()->enableLifetimeValidation &&
       !getContext()->refCountContext->isReferenceValid(hDevice)) {
-    getContext()->refCountContext->logInvalidReference(hDevice);
+    URLOG_CTX_INVALID_REFERENCE(hDevice);
   }
 
   ur_result_t result = pfnGetImageMemoryHandleTypeSupportExp(
@@ -8048,12 +8048,12 @@ urBindlessImagesGetImageUnsampledHandleSupportExp(
 
   if (getContext()->enableLifetimeValidation &&
       !getContext()->refCountContext->isReferenceValid(hContext)) {
-    getContext()->refCountContext->logInvalidReference(hContext);
+    URLOG_CTX_INVALID_REFERENCE(hContext);
   }
 
   if (getContext()->enableLifetimeValidation &&
       !getContext()->refCountContext->isReferenceValid(hDevice)) {
-    getContext()->refCountContext->logInvalidReference(hDevice);
+    URLOG_CTX_INVALID_REFERENCE(hDevice);
   }
 
   ur_result_t result = pfnGetImageUnsampledHandleSupportExp(
@@ -8111,12 +8111,12 @@ urBindlessImagesGetImageSampledHandleSupportExp(
 
   if (getContext()->enableLifetimeValidation &&
       !getContext()->refCountContext->isReferenceValid(hContext)) {
-    getContext()->refCountContext->logInvalidReference(hContext);
+    URLOG_CTX_INVALID_REFERENCE(hContext);
   }
 
   if (getContext()->enableLifetimeValidation &&
       !getContext()->refCountContext->isReferenceValid(hDevice)) {
-    getContext()->refCountContext->logInvalidReference(hDevice);
+    URLOG_CTX_INVALID_REFERENCE(hDevice);
   }
 
   ur_result_t result = pfnGetImageSampledHandleSupportExp(