diff --git a/etc/templates/closedVolume/system/fvSolution b/etc/templates/closedVolume/system/fvSolution
index bdb046f7dc..16d0ff2b85 100644
--- a/etc/templates/closedVolume/system/fvSolution
+++ b/etc/templates/closedVolume/system/fvSolution
@@ -78,18 +78,32 @@ potentialFlow
     nNonOrthogonalCorrectors 10;
 }
 
+// timeScheme = steadyState for a steady-state simulation; otherwise transient
+timeScheme $fvSchemes!ddtSchemes/default;
+
+#ifeq $timeScheme steadyState
 relaxationFactors
 {
+    // Steady-state relaxation factors
     fields
     {
-        p_rgh           0.7;
+        p     0.3;
     }
     equations
     {
-        U               0.3;
-        e               0.5;
+        U     0.7;
         "(k|omega|epsilon)" 0.7;
     }
 }
+#else
+relaxationFactors
+{
+    // Transient relaxation factors
+    equations
+    {
+        ".*"  1;
+    }
+}
+#endif
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/system/fvSolution b/etc/templates/closedVolumeRotating/system/fvSolution
index 890f838686..38bada5fbe 100644
--- a/etc/templates/closedVolumeRotating/system/fvSolution
+++ b/etc/templates/closedVolumeRotating/system/fvSolution
@@ -95,22 +95,32 @@ potentialFlow
     nNonOrthogonalCorrectors 10;
 }
 
+// timeScheme = steadyState for a steady-state simulation; otherwise transient
+timeScheme $fvSchemes!ddtSchemes/default;
+
+#ifeq $timeScheme steadyState
 relaxationFactors
 {
+    // Steady-state relaxation factors
     fields
     {
-        p               0.3;
+        p     0.3;
     }
     equations
     {
-        U               0.7;
+        U     0.7;
         "(k|omega|epsilon)" 0.7;
     }
 }
-
-cache
+#else
+relaxationFactors
 {
-    grad(U);
+    // Transient relaxation factors
+    equations
+    {
+        ".*"  1;
+    }
 }
+#endif
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflow/system/fvSolution b/etc/templates/inflowOutflow/system/fvSolution
index 9ea618b429..ea7ea8a825 100644
--- a/etc/templates/inflowOutflow/system/fvSolution
+++ b/etc/templates/inflowOutflow/system/fvSolution
@@ -77,17 +77,32 @@ potentialFlow
     nNonOrthogonalCorrectors 10;
 }
 
+// timeScheme = steadyState for a steady-state simulation; otherwise transient
+timeScheme $fvSchemes!ddtSchemes/default;
+
+#ifeq $timeScheme steadyState
 relaxationFactors
 {
+    // Steady-state relaxation factors
     fields
     {
-        p               0.3;
+        p     0.3;
     }
     equations
     {
-        U               0.7;
+        U     0.7;
         "(k|omega|epsilon)" 0.7;
     }
 }
+#else
+relaxationFactors
+{
+    // Transient relaxation factors
+    equations
+    {
+        ".*"  1;
+    }
+}
+#endif
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/system/fvSolution b/etc/templates/inflowOutflowRotating/system/fvSolution
index 890f838686..38bada5fbe 100644
--- a/etc/templates/inflowOutflowRotating/system/fvSolution
+++ b/etc/templates/inflowOutflowRotating/system/fvSolution
@@ -95,22 +95,32 @@ potentialFlow
     nNonOrthogonalCorrectors 10;
 }
 
+// timeScheme = steadyState for a steady-state simulation; otherwise transient
+timeScheme $fvSchemes!ddtSchemes/default;
+
+#ifeq $timeScheme steadyState
 relaxationFactors
 {
+    // Steady-state relaxation factors
     fields
     {
-        p               0.3;
+        p     0.3;
     }
     equations
     {
-        U               0.7;
+        U     0.7;
         "(k|omega|epsilon)" 0.7;
     }
 }
-
-cache
+#else
+relaxationFactors
 {
-    grad(U);
+    // Transient relaxation factors
+    equations
+    {
+        ".*"  1;
+    }
 }
+#endif
 
 // ************************************************************************* //