diff --git a/qcom/tuna-oemvm.dtsi b/qcom/tuna-oemvm.dtsi
index 2601180b..fe25e5ba 100644
--- a/qcom/tuna-oemvm.dtsi
+++ b/qcom/tuna-oemvm.dtsi
@@ -40,14 +40,24 @@
 	};
 
 	idle-states {
-		CPU_PWR_DWN: c4 {  /* Using Medium C4 latencies */
+		CPU_PWR_DWN: c4 {  /* Using Gold C4 latencies */
 			compatible = "arm,idle-state";
-			status = "disabled";
+			idle-state-name = "rail-pc";
+			entry-latency-us = <550>;
+			exit-latency-us = <1050>;
+			min-residency-us = <7951>;
+			arm,psci-suspend-param = <0x40000004>;
+			local-timer-stop;
 		};
 
-		CLUSTER_PWR_DWN: ss3 { /* C4+CL5+SS3 */
+		CLUSTER_PWR_DWN: d4 { /* C4+D4 */
 			compatible = "arm,idle-state";
-			status = "disabled";
+			idle-state-name = "l3-pc";
+			entry-latency-us = <750>;
+			exit-latency-us = <2350>;
+			min-residency-us = <9144>;
+			arm,psci-suspend-param = <0x40000044>;
+			local-timer-stop;
 		};
 	};
 
diff --git a/qcom/tuna-vm.dtsi b/qcom/tuna-vm.dtsi
index 93fd4c0c..e8cb6658 100644
--- a/qcom/tuna-vm.dtsi
+++ b/qcom/tuna-vm.dtsi
@@ -42,14 +42,24 @@
 	};
 
 	idle-states {
-		CPU_PWR_DWN: c4 {  /* Using Medium C4 latencies */
+		CPU_PWR_DWN: c4 {  /* Using Gold C4 latencies */
 			compatible = "arm,idle-state";
-			status = "disabled";
+			idle-state-name = "rail-pc";
+			entry-latency-us = <550>;
+			exit-latency-us = <1050>;
+			min-residency-us = <7951>;
+			arm,psci-suspend-param = <0x40000004>;
+			local-timer-stop;
 		};
 
-		CLUSTER_PWR_DWN: ss3 { /* C4+CL5+SS3 */
+		CLUSTER_PWR_DWN: d4 { /* C4+D4 */
 			compatible = "arm,idle-state";
-			status = "disabled";
+			idle-state-name = "l3-pc";
+			entry-latency-us = <750>;
+			exit-latency-us = <2350>;
+			min-residency-us = <9144>;
+			arm,psci-suspend-param = <0x40000044>;
+			local-timer-stop;
 		};
 	};