diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 57bfd0111e..5bd6106dfa 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -153,6 +153,7 @@ $(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG)
 		CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \
 		CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \
 		CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC=$(CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC) \
+		CONFIG_TIANOCORE_HAVE_EFI_SHELL=$(CONFIG_TIANOCORE_HAVE_EFI_SHELL) \
 		CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \
 		CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \
 		GCC_CC_x86_32=$(GCC_CC_x86_32) \
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index d6225134fa..1eaf0c8c96 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -147,8 +147,14 @@ config TIANOCORE_FOLLOW_BGRT_SPEC
 	default n
 	help
 	  Follow the BGRT Specification implemented by Microsoft and
-	  the Boot Logo will be vertically centered 38.2% from the
-	  top of the display.
+	  the Boot Logo 38.2% will be vertically centered 38.2% from
+	  the top of the display.
+
+config TIANOCORE_HAVE_EFI_SHELL
+	bool "Include EFI Shell"
+	default y
+	help
+	  Include the EFI shell Binary
 
 endif
 
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 9c9cc9a05e..14ec57a292 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -43,6 +43,9 @@ endif
 # PLATFORM_BOOT_TIMEOUT		= 3
 ifneq ($(TIANOCORE_BOOT_TIMEOUT),)
 BUILD_STR += -D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
+# SHELL_TYPE			= BUILD_SHELL
+ifneq ($(CONFIG_TIANOCORE_HAVE_EFI_SHELL),y)
+BUILD_STR += -D SHELL_TYPE=NONE
 endif
 # USE_CBMEM_FOR_CONSOLE		= FALSE
 ifeq ($(CONFIG_TIANOCORE_CBMEM_LOGGING),y)