diff --git a/etc/thermoData/refrigerant/R12/liquid.gz b/etc/thermoData/refrigerant/R12/liquid.gz
deleted file mode 100644
index d75e9c6ef7..0000000000
Binary files a/etc/thermoData/refrigerant/R12/liquid.gz and /dev/null differ
diff --git a/etc/thermoData/refrigerant/R12/vapour.gz b/etc/thermoData/refrigerant/R12/vapour.gz
deleted file mode 100644
index 542941f2c0..0000000000
Binary files a/etc/thermoData/refrigerant/R12/vapour.gz and /dev/null differ
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/T.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/T.liquid
index 2b06470aad..fb5c3d284a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/T.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/T.liquid
@@ -36,7 +36,7 @@ boundaryField
     wall
     {
         type            fixedMultiPhaseHeatFlux;
-        relax           0.1;
+        relax           0.6;
         q               uniform 0;
         phase           "liquid";
         value           $internalField;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/alphat.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/alphat.liquid
index 14471b6c13..ae5cb7d52b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/alphat.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/0/alphat.liquid
@@ -38,7 +38,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        relax           0.2;
+        relax           0.6;
         otherPhase      gas;
         phaseType       liquid;
         partitioningModel
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
index 59b4a401d1..96fcaf7484 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties
@@ -154,7 +154,7 @@ saturation
             refColumn           1;
             componentColumns    (0);
             mergeSeparators     no;
-            file "$FOAM_ETC/thermoData/refrigerant/R12/saturation.csv";
+            file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
             outOfBounds         clamp;
             interpolationScheme linear;
         }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
index 2c2cd71be3..93d74ae148 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/vapour"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-vapour"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
index ff757a907f..7551b4b867 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/liquid"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-liquid"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/T.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/T.liquid
index cac1030529..fb5c3d284a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/T.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/T.liquid
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [ 0 0 0 1 0 0 0 ];
 
-internalField   uniform 341.65;
+internalField   uniform 341.67;
 
 boundaryField
 {
@@ -36,7 +36,7 @@ boundaryField
     wall
     {
         type            fixedMultiPhaseHeatFlux;
-        relax           0.1;
+        relax           0.6;
         q               uniform 0;
         phase           "liquid";
         value           $internalField;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/alphat.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/alphat.liquid
index 14471b6c13..ae5cb7d52b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/alphat.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/0/alphat.liquid
@@ -38,7 +38,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        relax           0.2;
+        relax           0.6;
         otherPhase      gas;
         phaseType       liquid;
         partitioningModel
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
index 3fa142159e..4b9689091b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties
@@ -194,7 +194,7 @@ saturation
             refColumn           1;
             componentColumns    (0);
             mergeSeparators     no;
-            file "$FOAM_ETC/thermoData/refrigerant/R12/saturation.csv";
+            file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
             outOfBounds         clamp;
             interpolationScheme linear;
         }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
index 2c2cd71be3..93d74ae148 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/vapour"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-vapour"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
index ff757a907f..7551b4b867 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/liquid"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-liquid"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
index 419c0eb27e..2d95d00f43 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution
@@ -88,7 +88,7 @@ relaxationFactors
     equations
     {
         ".*"            1;
-        "h\..*"         0.9;
+        "h\..*"         1;
     }
 }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.liquid
index 2b06470aad..fb5c3d284a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.liquid
@@ -36,7 +36,7 @@ boundaryField
     wall
     {
         type            fixedMultiPhaseHeatFlux;
-        relax           0.1;
+        relax           0.6;
         q               uniform 0;
         phase           "liquid";
         value           $internalField;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.liquid
index 14471b6c13..ae5cb7d52b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.liquid
@@ -38,7 +38,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        relax           0.2;
+        relax           0.6;
         otherPhase      gas;
         phaseType       liquid;
         partitioningModel
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties
index 9358115e21..cbe0fd1dac 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties
@@ -237,7 +237,7 @@ saturation
             refColumn           1;
             componentColumns    (0);
             mergeSeparators     no;
-            file "$FOAM_ETC/thermoData/refrigerant/R12/saturation.csv";
+            file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
             outOfBounds         clamp;
             interpolationScheme linear;
         }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.gas
index 2c2cd71be3..93d74ae148 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.gas
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/vapour"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-vapour"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.liquid
index ff757a907f..7551b4b867 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.liquid
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/liquid"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-liquid"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/T.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/T.liquid
index 2b06470aad..fb5c3d284a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/T.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/T.liquid
@@ -36,7 +36,7 @@ boundaryField
     wall
     {
         type            fixedMultiPhaseHeatFlux;
-        relax           0.1;
+        relax           0.6;
         q               uniform 0;
         phase           "liquid";
         value           $internalField;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/alphat.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/alphat.liquid
index 14471b6c13..ae5cb7d52b 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/alphat.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/alphat.liquid
@@ -38,7 +38,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        relax           0.2;
+        relax           0.6;
         otherPhase      gas;
         phaseType       liquid;
         partitioningModel
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
index 633d88f685..d5d4a7852c 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties
@@ -326,7 +326,7 @@ saturation
             refColumn           1;
             componentColumns    (0);
             mergeSeparators     no;
-            file "$FOAM_ETC/thermoData/refrigerant/R12/saturation.csv";
+            file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
             outOfBounds         clamp;
             interpolationScheme linear;
         }
@@ -348,7 +348,7 @@ saturation
             refColumn           1;
             componentColumns    (0);
             mergeSeparators     no;
-            file "$FOAM_ETC/thermoData/refrigerant/R12/saturation.csv";
+            file "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-saturation.csv";
             outOfBounds         clamp;
             interpolationScheme linear;
         }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas
index 2c2cd71be3..93d74ae148 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/vapour"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-vapour"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas2 b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas2
index 2c2cd71be3..93d74ae148 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas2
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.gas2
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/vapour"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-vapour"
 }
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.liquid
index ff757a907f..7551b4b867 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/thermophysicalProperties.liquid
@@ -33,6 +33,6 @@ mixture
         molWeight       120.914;
     }
 
-    #include "$FOAM_ETC/thermoData/refrigerant/R12/liquid"
+    #include "$FOAM_TUTORIALS/resources/thermoData/wallBoiling-liquid"
 }
 // ************************************************************************* //
diff --git a/tutorials/resources/thermoData/wallBoiling-liquid.gz b/tutorials/resources/thermoData/wallBoiling-liquid.gz
new file mode 100644
index 0000000000..004c67280f
Binary files /dev/null and b/tutorials/resources/thermoData/wallBoiling-liquid.gz differ
diff --git a/etc/thermoData/refrigerant/R12/saturation.csv b/tutorials/resources/thermoData/wallBoiling-saturation.csv
similarity index 100%
rename from etc/thermoData/refrigerant/R12/saturation.csv
rename to tutorials/resources/thermoData/wallBoiling-saturation.csv
diff --git a/tutorials/resources/thermoData/wallBoiling-vapour.gz b/tutorials/resources/thermoData/wallBoiling-vapour.gz
new file mode 100644
index 0000000000..534b4caf9f
Binary files /dev/null and b/tutorials/resources/thermoData/wallBoiling-vapour.gz differ