diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index 89b0dbc0a4..01d86c272c 100644
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -121,8 +121,8 @@ struct cb_memory_range {
 #define CB_MEM_NVS          4
 #define CB_MEM_UNUSABLE     5
 #define CB_MEM_VENDOR_RSVD  6
-#define CB_MEM_TAG          7
 #define CB_MEM_TABLE       16
+#define CB_MEM_TAG         17
 
 struct cb_memory {
 	u32 tag;
diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h
index 251e2c4491..817ca0e4f2 100644
--- a/src/commonlib/include/commonlib/coreboot_tables.h
+++ b/src/commonlib/include/commonlib/coreboot_tables.h
@@ -143,8 +143,12 @@ struct lb_memory_range {
 #define LB_MEM_NVS		 4	/* ACPI NVS Memory */
 #define LB_MEM_UNUSABLE		 5	/* Unusable address space */
 #define LB_MEM_VENDOR_RSVD	 6	/* Vendor Reserved */
-#define LB_MEM_TAG		 7	/* Armv9 tag storage for MTE */
-#define LB_MEM_TABLE		16    /* Ram configuration tables are kept in */
+/*
+ * The memory type [1 ... 16) needs to match
+ * https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/15_System_Address_Map_Interfaces/Sys_Address_Map_Interfaces.html
+ */
+#define LB_MEM_TABLE		16	/* Ram configuration tables are kept in */
+#define LB_MEM_TAG		17	/* Armv9 tag storage for MTE */
 #define LB_MEM_SOFT_RESERVED	0xefffffff /* Specific purpose memory */
 };