diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
index 3f648b7de6..c186fee9a3 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
@@ -76,7 +76,7 @@ Returns:
     CallbackInfo->Data.VideoBIOS = (UINT8) (UINTN) (((EFI_IFR_DATA_ENTRY *)(DataArray + 1))->Data);
     gRT->SetVariable (
           L"VBIOS",
-          &gEfiGlobalVariableGuid,
+          &gEfiGenericPlatformVariableGuid,
           EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
           sizeof (UINT8),
           &CallbackInfo->Data.VideoBIOS
@@ -395,7 +395,7 @@ Returns:
   //
   VideoOption = BdsLibGetVariableAndSize (
                   L"VBIOS",
-                  &gEfiGlobalVariableGuid,
+                  &gEfiGenericPlatformVariableGuid,
                   &VideoOptionSize
                   );
   if (NULL == VideoOption) {
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index 3508095ad7..748340ddd2 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -212,6 +212,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>
+    </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiFlashMapHobGuid</GuidCName>
     </GuidCNames>
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index ae5b9f5ee5..c2f8d5bd16 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -105,6 +105,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiShellFileGuid</GuidCName>
     </GuidCNames>
+    <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>
+    </GuidCNames>
   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c
index 4748ffca51..f0ac12e0d6 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c
@@ -376,7 +376,7 @@ Done:
 
   gRT->SetVariable (
         L"PerfDataMemAddr",
-        &gEfiGlobalVariableGuid,
+        &gEfiGenericPlatformVariableGuid,
         EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
         sizeof (UINT32),
         (VOID *) &mAcpiLowMemoryBase