diff --git a/configs/builder/config.intel.crb.avc b/configs/builder/config.intel.crb.avc
index e547c4148f..433f06dac7 100644
--- a/configs/builder/config.intel.crb.avc
+++ b/configs/builder/config.intel.crb.avc
@@ -15,7 +15,6 @@ CONFIG_NO_GFX_INIT=y
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_PBP_BIN=y
 CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
-CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_PAYLOAD_LINUX=y
 
@@ -27,7 +26,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 #
 CONFIG_IFD_BIN_PATH="site-local/avenuecity/descriptor.bin"
 CONFIG_PBP_BIN_PATH="site-local/avenuecity/pbp.bin"
-CONFIG_CPU_UCODE_BINARIES="site-local/avenuecity/ucode.mcb"
 CONFIG_FSP_T_FILE="site-local/avenuecity/Server_T.fd"
 CONFIG_FSP_M_FILE="site-local/avenuecity/Server_M.fd"
 CONFIG_FSP_S_FILE="site-local/avenuecity/Server_S.fd"
diff --git a/configs/builder/config.intel.crb.bnc b/configs/builder/config.intel.crb.bnc
index a4ffaf7f29..80ec39133e 100644
--- a/configs/builder/config.intel.crb.bnc
+++ b/configs/builder/config.intel.crb.bnc
@@ -15,7 +15,6 @@ CONFIG_NO_GFX_INIT=y
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_PBP_BIN=y
 CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y
-CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_PAYLOAD_LINUX=y
 
@@ -27,7 +26,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 #
 CONFIG_IFD_BIN_PATH="site-local/beechnutcity/descriptor.bin"
 CONFIG_PBP_BIN_PATH="site-local/beechnutcity/pbp.bin"
-CONFIG_CPU_UCODE_BINARIES="site-local/beechnutcity/ucode.mcb"
 CONFIG_FSP_T_FILE="site-local/beechnutcity/Server_T.fd"
 CONFIG_FSP_M_FILE="site-local/beechnutcity/Server_M.fd"
 CONFIG_FSP_S_FILE="site-local/beechnutcity/Server_S.fd"
diff --git a/src/soc/intel/xeon_sp/gnr/Kconfig b/src/soc/intel/xeon_sp/gnr/Kconfig
index 4dee9616fe..a259320342 100644
--- a/src/soc/intel/xeon_sp/gnr/Kconfig
+++ b/src/soc/intel/xeon_sp/gnr/Kconfig
@@ -2,7 +2,6 @@
 
 config SOC_INTEL_GRANITERAPIDS
 	bool
-	select MICROCODE_BLOB_NOT_HOOKED_UP
 	select FSP_NVS_DATA_POST_SILICON_INIT
 	select SOC_INTEL_MEM_MAPPED_PM_CONFIGURATION
 	select XEON_SP_COMMON_BASE
diff --git a/src/soc/intel/xeon_sp/gnr/Makefile.mk b/src/soc/intel/xeon_sp/gnr/Makefile.mk
index 054d5132c1..7af7416973 100644
--- a/src/soc/intel/xeon_sp/gnr/Makefile.mk
+++ b/src/soc/intel/xeon_sp/gnr/Makefile.mk
@@ -26,4 +26,7 @@ CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/gnr
 
 CFLAGS_common += -fshort-wchar
 
+cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-ad-01
+cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-af-03
+
 endif ## CONFIG_SOC_INTEL_GRANITERAPIDS