diff --git a/Platforms/SurfaceDuo1Pkg/AcpiTables/AcpiTables.inf b/Platforms/SurfaceDuo1Pkg/AcpiTables/AcpiTables.inf
index 4a8c3eff4..4d92f094b 100644
--- a/Platforms/SurfaceDuo1Pkg/AcpiTables/AcpiTables.inf
+++ b/Platforms/SurfaceDuo1Pkg/AcpiTables/AcpiTables.inf
@@ -22,17 +22,17 @@
   #SelfSignedDriverEnabler.asl
 
 [Binaries.AARCH64]
-   ASL|SurfaceDuoACPI/8150/builtin/APIC.aml
-   ASL|SurfaceDuoACPI/8150/builtin/CSRT.aml
-   ASL|SurfaceDuoACPI/8150/builtin/DBG2.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8150/builtin/APIC.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8150/builtin/CSRT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8150/builtin/DBG2.aml
    ASL|SurfaceDuoACPI/8150/builtin/DSDT.aml
-   ASL|SurfaceDuoACPI/8150/builtin/GTDT.aml
-   ASL|SurfaceDuoACPI/8150/builtin/IORT.aml
-   ASL|SurfaceDuoACPI/8150/builtin/MCFG.aml
-   ASL|SurfaceDuoACPI/8150/builtin/PPTT.aml
-   ASL|SurfaceDuoACPI/common/builtin/SSDT.aml
-   ASL|SurfaceDuoACPI/common/builtin/TPMDev.dat
-   ASL|SurfaceDuoACPI/common/builtin/SoftwareTpm2Table.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8150/builtin/GTDT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8150/builtin/IORT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8150/builtin/MCFG.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8150/builtin/PPTT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/common/builtin/SSDT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/common/builtin/TPMDev.dat
+   ASL|SurfaceDuoACPI/QcomACPI/common/builtin/SoftwareTpm2Table.aml
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platforms/SurfaceDuo2Pkg/AcpiTables/AcpiTables.inf b/Platforms/SurfaceDuo2Pkg/AcpiTables/AcpiTables.inf
index d87cb50eb..1ab6bbd71 100644
--- a/Platforms/SurfaceDuo2Pkg/AcpiTables/AcpiTables.inf
+++ b/Platforms/SurfaceDuo2Pkg/AcpiTables/AcpiTables.inf
@@ -22,18 +22,18 @@
   #SelfSignedDriverEnabler.asl
 
 [Binaries.AARCH64]
-   ASL|SurfaceDuoACPI/8350/builtin/APIC.aml
-   ASL|SurfaceDuoACPI/8350/builtin/CSRT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8350/builtin/APIC.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8350/builtin/CSRT.aml
    ASL|SurfaceDuoACPI/8350/builtin/DBG2.OEMZE.aml
    ASL|SurfaceDuoACPI/8350/builtin/DSDT.aml
-   ASL|SurfaceDuoACPI/8350/builtin/GTDT.aml
-   ASL|SurfaceDuoACPI/8350/builtin/IORT.aml
-   ASL|SurfaceDuoACPI/8350/builtin/MCFG.aml
-   ASL|SurfaceDuoACPI/8350/builtin/PPTT.aml
-   ASL|SurfaceDuoACPI/8350/builtin/SPCR.aml
-   ASL|SurfaceDuoACPI/common/builtin/SSDT.aml
-   ASL|SurfaceDuoACPI/common/builtin/TPMDev.dat
-   ASL|SurfaceDuoACPI/common/builtin/SoftwareTpm2Table.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8350/builtin/GTDT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8350/builtin/IORT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8350/builtin/MCFG.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8350/builtin/PPTT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/8350/builtin/SPCR.aml
+   ASL|SurfaceDuoACPI/QcomACPI/common/builtin/SSDT.aml
+   ASL|SurfaceDuoACPI/QcomACPI/common/builtin/TPMDev.dat
+   ASL|SurfaceDuoACPI/QcomACPI/common/builtin/SoftwareTpm2Table.aml
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platforms/SurfaceDuoACPI b/Platforms/SurfaceDuoACPI
index 39f8a5827..8084a6a37 160000
--- a/Platforms/SurfaceDuoACPI
+++ b/Platforms/SurfaceDuoACPI
@@ -1 +1 @@
-Subproject commit 39f8a5827d3b5bbaacab1c3016e8a7fae2c432fe
+Subproject commit 8084a6a37c4b2faac58e8e01b97f786ef7c58a8c