diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 93bf2891a5..0b215eba3a 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -738,7 +738,7 @@ PrepareHobNvStorage (
 */
 {
   STATIC VARIABLE_STORE_HEADER VarStoreHeader = {
-    gEfiVariableGuid,
+    VARIABLE_STORE_SIGNATURE,
     0xffffffff,                 // will be fixed in Variable driver
     VARIABLE_STORE_FORMATTED,
     VARIABLE_STORE_HEALTHY,
diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index d20b3a78e3..eefaf0394c 100644
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -22,7 +22,7 @@ Abstract:
 #include "FSVariable.h"
 
 VARIABLE_STORE_HEADER mStoreHeaderTemplate = {
-  gEfiVariableGuid,
+  VARIABLE_STORE_SIGNATURE,
   VOLATILE_VARIABLE_STORE_SIZE,
   VARIABLE_STORE_FORMATTED,
   VARIABLE_STORE_HEALTHY,
diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 0c25efa8c3..ce94a12433 100644
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -247,7 +247,8 @@ FileStorageConstructor (
   ASSERT_EFI_ERROR (Status);
   ZeroMem (Dev, sizeof(VS_DEV));
 
-  CopyGuid (&Dev->Signature, &gEfiVariableGuid);
+  Dev->Signature          = VS_DEV_SIGNATURE;
+  //CopyGuid (&Dev->Signature, &gEfiVariableGuid);
   Dev->Size               = Size;
   VAR_DATA_PTR (Dev)      = (UINT8 *) (UINTN) NvStorageBase;
   VAR_FILE_VOLUMEID (Dev) = VolumeId;
diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index 02582d953a..a04d65b9ef 100644
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -59,7 +59,7 @@ MemStorageConstructor (
 
   ZeroMem (Dev, sizeof(VS_DEV));
 
-  CopyGuid (&Dev->Signature, &gEfiVariableGuid);
+  Dev->Signature   = VS_DEV_SIGNATURE;
   Dev->Size        = Size;
 
   Dev->VarStore.Erase    = MemEraseStore;