diff --git a/src/soc/amd/mendocino/agesa_acpi.c b/src/soc/amd/mendocino/agesa_acpi.c
index e0ca9ac926..7e85b13b87 100644
--- a/src/soc/amd/mendocino/agesa_acpi.c
+++ b/src/soc/amd/mendocino/agesa_acpi.c
@@ -15,10 +15,11 @@ uintptr_t agesa_write_acpi_tables(const struct device *device, uintptr_t current
 	acpi_ivrs_t *ivrs;
 
 	/* add ALIB SSDT from HOB */
+	current = acpi_align_current(current);
 	current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current);
 
 	/* IVRS */
-	current = ALIGN_UP(current, 8);
+	current = acpi_align_current(current);
 	ivrs = (acpi_ivrs_t *)current;
 	acpi_create_ivrs(ivrs, acpi_fill_ivrs);
 	current += ivrs->header.length;