diff --git a/UefiPayloadPkg/CfrSetupMenuDxe/SetupMenuCfr.c b/UefiPayloadPkg/CfrSetupMenuDxe/SetupMenuCfr.c
index 509ace9e22e5..5f4b68ff32bd 100644
--- a/UefiPayloadPkg/CfrSetupMenuDxe/SetupMenuCfr.c
+++ b/UefiPayloadPkg/CfrSetupMenuDxe/SetupMenuCfr.c
@@ -399,7 +399,7 @@ CfrProcessFormOption (
   if (Option->flags & CFR_OPTFLAG_SUPPRESS) {
     CfrProduceHiiForFlags (StartOpCodeHandle, EFI_IFR_SUPPRESS_IF_OP);
   }
-  if (Option->flags & CFR_OPTFLAG_GRAYOUT) {
+  if (Option->flags & CFR_OPTFLAG_INACTIVE) {
     CfrProduceHiiForFlags (StartOpCodeHandle, EFI_IFR_GRAY_OUT_IF_OP);
   }
 
@@ -412,7 +412,7 @@ CfrProcessFormOption (
                     );
   ASSERT (TempHiiBuffer != NULL);
 
-  if (Option->flags & CFR_OPTFLAG_GRAYOUT) {
+  if (Option->flags & CFR_OPTFLAG_INACTIVE) {
     TempHiiBuffer = HiiCreateEndOpCode (StartOpCodeHandle);
     ASSERT (TempHiiBuffer != NULL);
   }
@@ -523,7 +523,7 @@ CfrProcessNumericOption (
   if (Option->flags & CFR_OPTFLAG_SUPPRESS) {
     CfrProduceHiiForFlags (StartOpCodeHandle, EFI_IFR_SUPPRESS_IF_OP);
   }
-  if (Option->flags & CFR_OPTFLAG_GRAYOUT) {
+  if (Option->flags & CFR_OPTFLAG_INACTIVE) {
     CfrProduceHiiForFlags (StartOpCodeHandle, EFI_IFR_GRAY_OUT_IF_OP);
   }
 
@@ -622,7 +622,7 @@ CfrProcessNumericOption (
     ASSERT (TempHiiBuffer != NULL);
   }
 
-  if (Option->flags & CFR_OPTFLAG_GRAYOUT) {
+  if (Option->flags & CFR_OPTFLAG_INACTIVE) {
     TempHiiBuffer = HiiCreateEndOpCode (StartOpCodeHandle);
     ASSERT (TempHiiBuffer != NULL);
   }
@@ -766,7 +766,7 @@ CfrProcessCharacterOption (
   if (Option->flags & CFR_OPTFLAG_SUPPRESS) {
     CfrProduceHiiForFlags (StartOpCodeHandle, EFI_IFR_SUPPRESS_IF_OP);
   }
-  if (Option->flags & CFR_OPTFLAG_GRAYOUT) {
+  if (Option->flags & CFR_OPTFLAG_INACTIVE) {
     CfrProduceHiiForFlags (StartOpCodeHandle, EFI_IFR_GRAY_OUT_IF_OP);
   }
 
@@ -827,7 +827,7 @@ CfrProcessCharacterOption (
     ASSERT (TempHiiBuffer != NULL);
   }
 
-  if (Option->flags & CFR_OPTFLAG_GRAYOUT) {
+  if (Option->flags & CFR_OPTFLAG_INACTIVE) {
     TempHiiBuffer = HiiCreateEndOpCode (StartOpCodeHandle);
     ASSERT (TempHiiBuffer != NULL);
   }
diff --git a/UefiPayloadPkg/Include/Guid/CfrSetupMenuGuid.h b/UefiPayloadPkg/Include/Guid/CfrSetupMenuGuid.h
index 0b1e74627bd8..335bff3d610f 100644
--- a/UefiPayloadPkg/Include/Guid/CfrSetupMenuGuid.h
+++ b/UefiPayloadPkg/Include/Guid/CfrSetupMenuGuid.h
@@ -34,9 +34,10 @@ extern EFI_GUID gEfiCfrSetupMenuFormGuid;
  */
 enum cfr_option_flags {
   CFR_OPTFLAG_READONLY  = 1 << 0,
-  CFR_OPTFLAG_GRAYOUT   = 1 << 1,
+  CFR_OPTFLAG_INACTIVE  = 1 << 1,
   CFR_OPTFLAG_SUPPRESS  = 1 << 2,
   CFR_OPTFLAG_VOLATILE  = 1 << 3,
+  CFR_OPTFLAG_RUNTIME   = 1 << 4,
 };
 
 #define CB_TAG_CFR_VARCHAR_OPT_NAME     0x0007