diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
index 00d03e75be..c982b24c2a 100644
--- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
+++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
@@ -2,6 +2,7 @@
 # Module that drives the table generation and installation process.
 #
 #  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+#  Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -28,7 +29,7 @@
   Arm/ArmDynamicTableManager.c
 
 [Sources.IA32, Sources.X64]
-  DynamicTableManagerNull.c
+  X64/X64DynamicTableManager.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerNull.c b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/X64/X64DynamicTableManager.c
old mode 100644
new mode 100755
similarity index 79%
rename from DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerNull.c
rename to DynamicTablesPkg/Drivers/DynamicTableManagerDxe/X64/X64DynamicTableManager.c
index d9b727468a..a5457f383d
--- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerNull.c
+++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/X64/X64DynamicTableManager.c
@@ -1,7 +1,8 @@
 /** @file
-  Common Dynamic Table Manager Dxe
+  X64 Dynamic Table Manager Dxe
 
   Copyright (c) 2024, Arm Limited. All rights reserved.
+  Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved.
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -25,11 +26,9 @@
 
 ///
 /// Array containing the ACPI tables to check.
-/// This is a dummy list only existing for build purpose.
-/// The FADT table must be placed at index 0.
 ///
-ACPI_TABLE_PRESENCE_INFO  mAcpiVerifyTables[] = {
-  { EStdAcpiTableIdFadt, EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, "FADT", TRUE, 0 },
+STATIC ACPI_TABLE_PRESENCE_INFO  mAcpiVerifyTables[] = {
+  { EStdAcpiTableIdFadt, EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, "FADT", TRUE, 0 }
 };
 
 /** Get the arch specific ACPI table presence information.
@@ -40,7 +39,6 @@ ACPI_TABLE_PRESENCE_INFO  mAcpiVerifyTables[] = {
                                   -1 if absent.
 
   @retval EFI_SUCCESS           Success.
-  @retval EFI_UNSUPPORTED       Unsupported.
 **/
 EFI_STATUS
 EFIAPI
@@ -50,10 +48,9 @@ GetAcpiTablePresenceInfo (
   OUT INT32                     *FadtIndex
   )
 {
-  // Dummy function - Not Implemented.
   *PresenceArray      = mAcpiVerifyTables;
   *PresenceArrayCount = ARRAY_SIZE (mAcpiVerifyTables);
   *FadtIndex          = ACPI_TABLE_VERIFY_FADT;
 
-  return EFI_UNSUPPORTED;
+  return EFI_SUCCESS;
 }