diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp
index c350af833a..9fb5e3ad06 100644
--- a/level_zero/core/source/device/device_imp.cpp
+++ b/level_zero/core/source/device/device_imp.cpp
@@ -309,7 +309,15 @@ void DeviceImp::populateSubDeviceCopyEngineGroups() {
         return;
     }
 
-    NEO::Device *activeSubDevice = activeDevice->getSubDevice(0u);
+    NEO::Device *activeSubDevice = nullptr;
+    for (auto &subDevice : activeDevice->getSubDevices()) {
+        if (subDevice) {
+            activeSubDevice = subDevice;
+            break;
+        }
+    }
+    UNRECOVERABLE_IF(!activeSubDevice);
+
     auto &subDeviceEngineGroups = activeSubDevice->getRegularEngineGroups();
     uint32_t numSubDeviceEngineGroups = static_cast<uint32_t>(subDeviceEngineGroups.size());
 
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index c36def1f5c..3c66c5bb47 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -31,7 +31,7 @@ components:
     branch: master
     dest_dir: infra
     fetch_tags: true
-    revision: v5341
+    revision: v5415
     type: git
   internal:
     branch: master
diff --git a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp
index 7878256eb4..849eed835b 100644
--- a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp
@@ -115,6 +115,11 @@ XE_HPC_CORETEST_F(ProgramWalkerTestsXeHpcCore, givenProperThreadGroupSizesWhenWa
 
     HardwareInterfaceWalkerArgs walkerArgs = createHardwareInterfaceWalkerArgs(workSize, wgInfo, PreemptionMode::Disabled);
 
+    const auto &productHelper = clDevice->getProductHelper();
+
+    auto hwInfo = clDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->getMutableHardwareInfo();
+    hwInfo->platform.usRevId = productHelper.getHwRevIdFromStepping(REVISION_A0, *hwInfo);
+
     {
         HardwareInterface<FamilyType>::programWalker(commandStream, *mockKernel->mockKernel, *commandQueue,
                                                      heap, heap, heap, dispatchInfo, walkerArgs);
diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp
index ce4dcaf93f..0afac320ed 100644
--- a/shared/source/xe_hpc_core/hw_info_pvc.cpp
+++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp
@@ -27,7 +27,7 @@ const PLATFORM PVC::platform = {
     IGFX_XE_HPC_CORE,
     PLATFORM_NONE,     // default init
     pvcXtDeviceIds[0], // usDeviceID
-    7,                 // usRevId
+    47,                // usRevId
     0,                 // usDeviceID_PCH
     0,                 // usRevId_PCH
     GTTYPE_UNDEFINED};
diff --git a/target_unit_tests/xe_hpc_core/pvc/enable_pvc_testing.cmake b/target_unit_tests/xe_hpc_core/pvc/enable_pvc_testing.cmake
index 308add06fa..345991ebb2 100644
--- a/target_unit_tests/xe_hpc_core/pvc/enable_pvc_testing.cmake
+++ b/target_unit_tests/xe_hpc_core/pvc/enable_pvc_testing.cmake
@@ -5,6 +5,6 @@
 #
 
 if(TESTS_PVC)
-  set(unit_test_config "pvc/2/4/5/3") # non-zero values for unit tests
+  set(unit_test_config "pvc/2/4/5/47") # non-zero values for unit tests
   include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()