diff --git a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
index 406bd94f56..d63a19b390 100644
--- a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
+++ b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Madt.aslc
@@ -26,19 +26,19 @@
   #pragma pack (1)
 
   typedef struct {
-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;
+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;
     EFI_ACPI_5_0_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];
     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;
-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
 
   #pragma pack ()
 
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
     {
       ARM_ACPI_HEADER (
-        EFI_ACPI_1_0_APIC_SIGNATURE,
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION
       ),
       //
       // MADT specific fields
@@ -68,20 +68,20 @@
   #pragma pack (1)
 
   typedef struct {
-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;
+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;
     EFI_ACPI_5_1_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];
     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;
     EFI_ACPI_6_0_GIC_MSI_FRAME_STRUCTURE                  MsiFrame;
-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
 
   #pragma pack ()
 
-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
     {
       ARM_ACPI_HEADER (
-        EFI_ACPI_1_0_APIC_SIGNATURE,
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,
-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,
+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION
       ),
       //
       // MADT specific fields