diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc
index 1359166d70..626260f93e 100644
--- a/src/soc/amd/common/Makefile.inc
+++ b/src/soc/amd/common/Makefile.inc
@@ -38,7 +38,7 @@ AMDFW_CFG_WITH_PATH = $(shell echo "$(AMDFW_CFG_FILES)" | tr ' ' '\n' | grep "/"
 DEP_FILES = $(patsubst %,$(FIRMWARE_LOCATION)/%, $(AMDFW_CFG_IN_FW_LOC)) \
 	$(AMDFW_CFG_WITH_PATH)
 
-amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.bin)
+amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*U?odePatch*.bin)
 
 ifeq ($(CONFIG_RESET_VECTOR_IN_RAM),y)
 $(objcbfs)/bootblock.bin: $(obj)/amdfw.rom $(obj)/fmap_config.h
diff --git a/src/soc/amd/genoa/Kconfig b/src/soc/amd/genoa/Kconfig
index cbf0ddd801..973677d538 100644
--- a/src/soc/amd/genoa/Kconfig
+++ b/src/soc/amd/genoa/Kconfig
@@ -34,6 +34,7 @@ config SOC_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_SMU_SX_ENTRY
 	select SOC_AMD_COMMON_BLOCK_TSC
 	select SOC_AMD_COMMON_BLOCK_UART
+	select SOC_AMD_COMMON_BLOCK_UCODE
 	select SOC_AMD_COMMON_BLOCK_USE_ESPI
 	select X86_CUSTOM_BOOTMEDIA
 
diff --git a/src/soc/amd/genoa/cpu.c b/src/soc/amd/genoa/cpu.c
index 6a07c34898..241bec21fd 100644
--- a/src/soc/amd/genoa/cpu.c
+++ b/src/soc/amd/genoa/cpu.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/cpu.h>
 #include <amdblocks/mca.h>
+#include <cpu/amd/microcode.h>
 #include <cpu/cpu.h>
 #include <device/device.h>
 #include <soc/cpu.h>
@@ -10,6 +11,8 @@ static void model_19_init(struct device *dev)
 {
 	check_mca();
 	set_cstate_io_addr();
+
+	amd_apply_microcode_patch();
 }
 
 static struct device_operations cpu_dev_ops = {