diff --git a/unified-runtime/CMakeLists.txt b/unified-runtime/CMakeLists.txt
index ff9e0d2b554ce..9115f52617c4f 100644
--- a/unified-runtime/CMakeLists.txt
+++ b/unified-runtime/CMakeLists.txt
@@ -225,7 +225,7 @@ if(UR_ENABLE_TRACING)
     endif()
 
     if (MSVC)
-        set(TARGET_XPTI $<IF:$<CONFIG:Release>,xpti,xptid>)
+        set(TARGET_XPTI $<IF:$<CONFIG:Release,RelWithDebInfo,MinSizeRel>,xpti,xptid>)
     else()
         set(TARGET_XPTI xpti)
     endif()
diff --git a/xpti/CMakeLists.txt b/xpti/CMakeLists.txt
index 1cf74b98a5386..50f84fef817e2 100644
--- a/xpti/CMakeLists.txt
+++ b/xpti/CMakeLists.txt
@@ -35,9 +35,9 @@ if (MSVC)
     if (CMAKE_BUILD_TYPE MATCHES "Release")
       set(XPTI_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
     elseif (CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
-      set(XPTI_CXX_FLAGS "${CMAKE_CXX_FLAGS_MINSIZEREL}")
-    elseif (CMAKE_BUILD_TYPE MATCHES "MinSizeRel")
       set(XPTI_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    elseif (CMAKE_BUILD_TYPE MATCHES "MinSizeRel")
+      set(XPTI_CXX_FLAGS "${CMAKE_CXX_FLAGS_MINSIZEREL}")
     endif()
     string(REPLACE "/MD" "" XPTI_CXX_FLAGS "${XPTI_CXX_FLAGS}")
     string(REPLACE "/MT" "" XPTI_CXX_FLAGS "${XPTI_CXX_FLAGS}")