diff --git a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp
index a3bc698102..dab1e03955 100644
--- a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp
+++ b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp
@@ -4508,9 +4508,9 @@ TEST_F(DeviceSimpleTests, givenDeviceThenValidUuidIsReturned) {
     device->getProperties(&deviceProps);
     uint32_t rootDeviceIndex = neoDevice->getRootDeviceIndex();
 
-    EXPECT_EQ(memcmp(&deviceProps.vendorId, deviceProps.uuid.id, sizeof(uint32_t)), 0);
-    EXPECT_EQ(memcmp(&deviceProps.deviceId, deviceProps.uuid.id + sizeof(uint32_t), sizeof(uint32_t)), 0);
-    EXPECT_EQ(memcmp(&rootDeviceIndex, deviceProps.uuid.id + (2 * sizeof(uint32_t)), sizeof(uint32_t)), 0);
+    EXPECT_EQ(memcmp(&deviceProps.vendorId, deviceProps.uuid.id, sizeof(uint16_t)), 0);
+    EXPECT_EQ(memcmp(&deviceProps.deviceId, deviceProps.uuid.id + sizeof(uint16_t), sizeof(uint16_t)), 0);
+    EXPECT_EQ(memcmp(&rootDeviceIndex, deviceProps.uuid.id + (3 * sizeof(uint16_t)), sizeof(uint32_t)), 0);
 }
 
 TEST_F(DeviceSimpleTests, WhenGettingKernelPropertiesThenSuccessIsReturned) {
diff --git a/shared/source/device/device.cpp b/shared/source/device/device.cpp
index 8514be4971..fe8bb63438 100644
--- a/shared/source/device/device.cpp
+++ b/shared/source/device/device.cpp
@@ -901,7 +901,7 @@ bool Device::getUuid(std::array<uint8_t, ProductHelper::uuidSize> &uuid) {
 
 bool Device::generateUuidFromPciBusInfo(const PhysicalDevicePciBusInfo &pciBusInfo, std::array<uint8_t, ProductHelper::uuidSize> &uuid) {
     if (pciBusInfo.pciDomain != PhysicalDevicePciBusInfo::invalidValue) {
-        uuid.fill(0);
+        generateUuid(uuid);
 
         /* Device UUID uniquely identifies a device within a system.
          * We generate it based on device information along with PCI information
@@ -927,20 +927,17 @@ bool Device::generateUuidFromPciBusInfo(const PhysicalDevicePciBusInfo &pciBusIn
             uint8_t reserved[4];
             uint8_t subDeviceID;
         };
+        static_assert(sizeof(DeviceUUID) == ProductHelper::uuidSize);
+
+        DeviceUUID deviceUUID{};
+        memcpy_s(&deviceUUID, sizeof(DeviceUUID), uuid.data(), uuid.size());
 
-        DeviceUUID deviceUUID = {};
-        deviceUUID.vendorID = 0x8086; // Intel
-        deviceUUID.deviceID = getHardwareInfo().platform.usDeviceID;
-        deviceUUID.revisionID = getHardwareInfo().platform.usRevId;
         deviceUUID.pciDomain = static_cast<uint16_t>(pciBusInfo.pciDomain);
         deviceUUID.pciBus = static_cast<uint8_t>(pciBusInfo.pciBus);
         deviceUUID.pciDev = static_cast<uint8_t>(pciBusInfo.pciDevice);
         deviceUUID.pciFunc = static_cast<uint8_t>(pciBusInfo.pciFunction);
-        deviceUUID.subDeviceID = isSubDevice() ? static_cast<SubDevice *>(this)->getSubDeviceIndex() + 1 : 0;
 
-        static_assert(sizeof(DeviceUUID) == ProductHelper::uuidSize);
-
-        memcpy_s(uuid.data(), ProductHelper::uuidSize, &deviceUUID, sizeof(DeviceUUID));
+        memcpy_s(uuid.data(), uuid.size(), &deviceUUID, sizeof(DeviceUUID));
 
         return true;
     }
@@ -951,10 +948,16 @@ void Device::generateUuid(std::array<uint8_t, ProductHelper::uuidSize> &uuid) {
     const auto &deviceInfo = getDeviceInfo();
     const auto &hardwareInfo = getHardwareInfo();
     uint32_t rootDeviceIndex = getRootDeviceIndex();
+    uint16_t vendorId = static_cast<uint16_t>(deviceInfo.vendorId);
+    uint16_t deviceId = static_cast<uint16_t>(hardwareInfo.platform.usDeviceID);
+    uint16_t revisionId = static_cast<uint16_t>(hardwareInfo.platform.usRevId);
+    uint8_t subDeviceId = isSubDevice() ? static_cast<SubDevice *>(this)->getSubDeviceIndex() + 1 : 0;
     uuid.fill(0);
-    memcpy_s(&uuid[0], sizeof(uint32_t), &deviceInfo.vendorId, sizeof(deviceInfo.vendorId));
-    memcpy_s(&uuid[4], sizeof(uint32_t), &hardwareInfo.platform.usDeviceID, sizeof(hardwareInfo.platform.usDeviceID));
-    memcpy_s(&uuid[8], sizeof(uint32_t), &rootDeviceIndex, sizeof(rootDeviceIndex));
+    memcpy_s(&uuid[0], sizeof(uint32_t), &vendorId, sizeof(vendorId));
+    memcpy_s(&uuid[2], sizeof(uint32_t), &deviceId, sizeof(deviceId));
+    memcpy_s(&uuid[4], sizeof(uint32_t), &revisionId, sizeof(revisionId));
+    memcpy_s(&uuid[6], sizeof(uint32_t), &rootDeviceIndex, sizeof(rootDeviceIndex));
+    uuid[15] = subDeviceId;
 }
 
 void Device::getAdapterMask(uint32_t &nodeMask) {
diff --git a/shared/test/unit_test/device/neo_device_tests.cpp b/shared/test/unit_test/device/neo_device_tests.cpp
index 381a7d5092..dc7f07826b 100644
--- a/shared/test/unit_test/device/neo_device_tests.cpp
+++ b/shared/test/unit_test/device/neo_device_tests.cpp
@@ -273,9 +273,14 @@ TEST_F(DeviceTest, GivenDeviceWhenGenerateUuidThenValidValuesAreSet) {
     uint32_t rootDeviceIndex = pDevice->getRootDeviceIndex();
 
     expectedUuid.fill(0);
-    memcpy_s(&expectedUuid[0], sizeof(uint32_t), &pDevice->getDeviceInfo().vendorId, sizeof(pDevice->getDeviceInfo().vendorId));
-    memcpy_s(&expectedUuid[4], sizeof(uint32_t), &pDevice->getHardwareInfo().platform.usDeviceID, sizeof(pDevice->getHardwareInfo().platform.usDeviceID));
-    memcpy_s(&expectedUuid[8], sizeof(uint32_t), &rootDeviceIndex, sizeof(rootDeviceIndex));
+    uint16_t vendorId = 0x8086; // Intel
+    uint16_t deviceId = static_cast<uint16_t>(pDevice->getHardwareInfo().platform.usDeviceID);
+    uint16_t revisionId = static_cast<uint16_t>(pDevice->getHardwareInfo().platform.usRevId);
+
+    memcpy_s(&expectedUuid[0], sizeof(uint16_t), &vendorId, sizeof(uint16_t));
+    memcpy_s(&expectedUuid[2], sizeof(uint16_t), &deviceId, sizeof(uint16_t));
+    memcpy_s(&expectedUuid[4], sizeof(uint16_t), &revisionId, sizeof(uint16_t));
+    memcpy_s(&expectedUuid[6], sizeof(uint32_t), &rootDeviceIndex, sizeof(rootDeviceIndex));
 
     EXPECT_EQ(memcmp(&uuid, &expectedUuid, ProductHelper::uuidSize), 0);
 }