diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
index 30dc2b8291..6246a106f7 100644
--- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
+++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
@@ -28,7 +28,7 @@
 [Sources.ARM, Sources.AARCH64]
   Arm/ArmDynamicTableManager.c
 
-[Sources.IA32, Sources.X64]
+[Sources.X64]
   X64/X64DynamicTableManager.c
 
 [Packages]
diff --git a/DynamicTablesPkg/DynamicTables.dsc.inc b/DynamicTablesPkg/DynamicTables.dsc.inc
index d8c92dece5..1b7379c726 100644
--- a/DynamicTablesPkg/DynamicTables.dsc.inc
+++ b/DynamicTablesPkg/DynamicTables.dsc.inc
@@ -30,7 +30,7 @@
 [LibraryClasses.AARCH64]
   DynamicTablesScmiInfoLib|DynamicTablesPkg/Library/DynamicTablesScmiInfoLib/DynamicTablesScmiInfoLib.inf
 
-[Components.common]
+[Components.ARM, Components.AARCH64, Components.X64]
   #
   # Generators (Common)
   #
@@ -59,9 +59,9 @@
   #
   DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
 
-[Components.IA32, Components.X64]
+[Components.X64]
   #
-  # Generators (IA32/X64 specific)
+  # Generators (X64 specific)
   #
   DynamicTablesPkg/Library/Acpi/X64/AcpiFacsLib/AcpiFacsLib.inf
   DynamicTablesPkg/Library/Acpi/X64/AcpiHpetLib/AcpiHpetLib.inf
diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/DynamicTablesPkg.dsc
index d8c04779b9..31eac32c8d 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dsc
+++ b/DynamicTablesPkg/DynamicTablesPkg.dsc
@@ -15,7 +15,7 @@
   PLATFORM_VERSION               = 0.1
   DSC_SPECIFICATION              = 0x0001001a
   OUTPUT_DIRECTORY               = Build/DynamicTables
-  SUPPORTED_ARCHITECTURES        = ARM|AARCH64|IA32|X64
+  SUPPORTED_ARCHITECTURES        = ARM|AARCH64|X64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf
index 3a3464e49c..6d942f2170 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf
@@ -2,6 +2,7 @@
 # DBG2 Table Generator
 #
 #  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>
+#  Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -23,7 +24,7 @@
 [Sources.ARM, Sources.AARCH64]
   Arm/ArmDbg2Generator.c
 
-[Sources.IA32, Sources.X86, Sources.X64]
+[Sources.X64]
   Dbg2GeneratorNull.c
 
 [Packages.ARM, Packages.AARCH64]
diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf
index b4b899ca17..7bd7bdb493 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf
@@ -2,6 +2,7 @@
 #  FADT Table Generator
 #
 #  Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
+#  Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -23,7 +24,7 @@
 [Sources.ARM, Sources.AARCH64]
   Arm/ArmFadtGenerator.c
 
-[Sources.IA32, Sources.X64]
+[Sources.X64]
   X64/X64FadtGenerator.c
 
 [Packages]
diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf
index ec2b4ce935..a9cf509218 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf
@@ -24,7 +24,7 @@
 [Sources.ARM, Sources.AARCH64]
   Arm/ArmSratGenerator.c
 
-[Sources.IA32, Sources.X64]
+[Sources.X64]
   X64/X64SratGenerator.c
 
 [Packages]
diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf
index fe0be2362c..292dc933c1 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf
@@ -2,6 +2,7 @@
 # Ssdt Cpu Topology Table Generator
 #
 #  Copyright (c) 2021, Arm Limited. All rights reserved.<BR>
+#  Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -23,7 +24,7 @@
 [Sources.ARM, Sources.AARCH64]
   Arm/ArmSsdtCpuTopologyGenerator.c
 
-[Sources.IA32, Sources.X64]
+[Sources.X64]
   X64/X64SsdtCpuTopologyGenerator.c
 
 [Packages.ARM, Packages.AARCH64]
diff --git a/DynamicTablesPkg/Library/Acpi/X64/AcpiMadtLib/AcpiMadtLib.inf b/DynamicTablesPkg/Library/Acpi/X64/AcpiMadtLib/AcpiMadtLib.inf
index 8cca73c55b..5a0fd74add 100644
--- a/DynamicTablesPkg/Library/Acpi/X64/AcpiMadtLib/AcpiMadtLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/X64/AcpiMadtLib/AcpiMadtLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  MADT Table Generator
 #
-#  Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
+#  Copyright (C) 2024 - 2025 Advanced Micro Devices, Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -19,10 +19,10 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64
+#  VALID_ARCHITECTURES           = X64
 #
 
-[Sources.IA32, Sources.X64]
+[Sources.X64]
   MadtGenerator.c
 
 [Packages]
diff --git a/DynamicTablesPkg/Library/Acpi/X64/AcpiWsmtLib/AcpiWsmtLib.inf b/DynamicTablesPkg/Library/Acpi/X64/AcpiWsmtLib/AcpiWsmtLib.inf
index 06e8f8cd3f..60490bd81e 100644
--- a/DynamicTablesPkg/Library/Acpi/X64/AcpiWsmtLib/AcpiWsmtLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/X64/AcpiWsmtLib/AcpiWsmtLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  WSMT Table Generator
 #
-#  Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
+#  Copyright (c) 2024 - 2025 Advanced Micro Devices, Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -19,10 +19,10 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64
+#  VALID_ARCHITECTURES           = X64
 #
 
-[Sources.IA32, Sources.X64]
+[Sources.X64]
   WsmtGenerator.c
 
 [Packages]
diff --git a/DynamicTablesPkg/Test/DynamicTablesPkgHostTest.dsc b/DynamicTablesPkg/Test/DynamicTablesPkgHostTest.dsc
index cf5dd63c80..33adde938b 100644
--- a/DynamicTablesPkg/Test/DynamicTablesPkgHostTest.dsc
+++ b/DynamicTablesPkg/Test/DynamicTablesPkgHostTest.dsc
@@ -3,6 +3,7 @@
 #
 # Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. <BR>
 # Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
+# Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
 # Copyright (C) Microsoft Corporation.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -14,7 +15,7 @@
   PLATFORM_VERSION        = 0.1
   DSC_SPECIFICATION       = 0x00010005
   OUTPUT_DIRECTORY        = Build/DynamicTablesPkg/HostTest
-  SUPPORTED_ARCHITECTURES = IA32|X64
+  SUPPORTED_ARCHITECTURES = X64
   BUILD_TARGETS           = NOOPT
   SKUID_IDENTIFIER        = DEFAULT