diff --git a/src/soc/intel/icelake/acpi/pch_hda.asl b/src/soc/intel/icelake/acpi/pch_hda.asl
index b5b5416f1c..1073f37ae8 100644
--- a/src/soc/intel/icelake/acpi/pch_hda.asl
+++ b/src/soc/intel/icelake/acpi/pch_hda.asl
@@ -56,9 +56,9 @@ Device (HDAS)
 				CreateQWordField (NBUF, ^NHLT._MAX, NMAS)
 				CreateQWordField (NBUF, ^NHLT._LEN, NLEN)
 
-				Store (NHLA, NBAS)
-				Store (NHLA, NMAS)
-				Store (NHLL, NLEN)
+				NBAS = NHLA
+				NMAS = NHLA
+				NLEN = NHLL
 
 				Return (NBUF)
 			}
diff --git a/src/soc/intel/icelake/acpi/scs.asl b/src/soc/intel/icelake/acpi/scs.asl
index dbc61c8b9a..24a2b28c4f 100644
--- a/src/soc/intel/icelake/acpi/scs.asl
+++ b/src/soc/intel/icelake/acpi/scs.asl
@@ -37,22 +37,22 @@ Scope (\_SB.PCI0) {
 		Method(_PS0, 0, Serialized) {
 			Stall (50) // Sleep 50 us
 
-			Store(0, PGEN) // Disable PG
+			PGEN = 0 // Disable PG
 
 			/* Clear register 0x1C20/0x4820 */
 			^^SCSC (PID_EMMC)
 
 			/* Set Power State to D0 */
 			And (PMCR, 0xFFFC, PMCR)
-			Store (PMCR, ^TEMP)
+			^TEMP = PMCR
 		}
 
 		Method(_PS3, 0, Serialized) {
-			Store(1, PGEN) // Enable PG
+			PGEN = 1 // Enable PG
 
 			/* Set Power State to D3 */
 			Or (PMCR, 0x0003, PMCR)
-			Store (PMCR, ^TEMP)
+			^TEMP = PMCR
 		}
 
 		Device (CARD)
@@ -90,23 +90,23 @@ Scope (\_SB.PCI0) {
 
 		Method (_PS0, 0, Serialized)
 		{
-			Store (0, PGEN) /* Disable PG */
+			PGEN = 0 /* Disable PG */
 
 			/* Clear register 0x1C20/0x4820 */
 			^^SCSC (PID_SDX)
 
 			/* Set Power State to D0 */
 			And (PMCR, 0xFFFC, PMCR)
-			Store (PMCR, ^TEMP)
+			^TEMP = PMCR
 		}
 
 		Method (_PS3, 0, Serialized)
 		{
-			Store (1, PGEN) /* Enable PG */
+			PGEN = 1 /* Enable PG */
 
 			/* Set Power State to D3 */
 			Or (PMCR, 0x0003, PMCR)
-			Store (PMCR, ^TEMP)
+			^TEMP = PMCR
 		}
 
 		Device (CARD)