diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0/U.orig b/tutorials/multiphase/interFoam/RAS/DTCHull/0/U.orig
index f7f9b1f286..a999a6b157 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0/U.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0/U.orig
@@ -43,6 +43,7 @@ boundaryField
     atmosphere
     {
         type            pressureInletOutletVelocity;
+        tangentialVelocity $internalField;
         value           uniform (0 0 0);
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U.orig
index ed6f6954a6..a999a6b157 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U.orig
@@ -15,42 +15,38 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+UMean 1.668;
+
 dimensions      [0 1 -1 0 0 0 0];
 
-internalField   uniform (-1.668 0 0);
+internalField   uniform (#neg $UMean 0 0);
 
 boundaryField
 {
-    atmosphere
-    {
-        type            pressureInletOutletVelocity;
-        tangentialVelocity uniform (-1.668 0 0);
-        value           uniform (0 0 0);
-    }
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
     inlet
     {
         type            fixedValue;
-        value           uniform (-1.668 0 0);
+        value           $internalField;
     }
+
     outlet
     {
         type            outletPhaseMeanVelocity;
-        UnMean          constant 1.668;
         alpha           alpha.water;
-        value           uniform (-1.668 0 0);
+        UnMean          $UMean;
+        value           $internalField;
     }
-    bottom
+
+    atmosphere
     {
-        type            symmetryPlane;
-    }
-    side
-    {
-        type            symmetryPlane;
-    }
-    midPlane
-    {
-        type            symmetryPlane;
+        type            pressureInletOutletVelocity;
+        tangentialVelocity $internalField;
+        value           uniform (0 0 0);
     }
+
     hull
     {
         type            movingWallVelocity;
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/k.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/k.orig
index cb8345f02d..8b1a0106bd 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/k.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/k.orig
@@ -21,41 +21,34 @@ internalField   uniform 0.00015;
 
 boundaryField
 {
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.00015;
-        value           uniform 0.00015;
-    }
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
     inlet
     {
         type            fixedValue;
-        value           uniform 0.00015;
+        value           $internalField;
     }
+
     outlet
+    {
+       type            inletOutlet;
+       inletValue      $internalField;
+       value           $internalField;
+    }
+
+    atmosphere
     {
         type            inletOutlet;
-        inletValue      uniform 0.00015;
-        value           uniform 0.00015;
-    }
-    bottom
-    {
-        type            symmetryPlane;
-    }
-    side
-    {
-        type            symmetryPlane;
-    }
-    midPlane
-    {
-        type            symmetryPlane;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     hull
     {
         type            kqRWallFunction;
-        value           uniform 0.00015;
+        value           $internalField;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/nut.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/nut.orig
index 0401bfc5c8..a58918c5ec 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/nut.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/nut.orig
@@ -21,37 +21,31 @@ internalField   uniform 5e-07;
 
 boundaryField
 {
-    atmosphere
-    {
-        type            zeroGradient;
-    }
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
     inlet
     {
         type            fixedValue;
-        value           uniform 5e-07;
+        value           $internalField;
     }
+
     outlet
     {
         type            zeroGradient;
     }
-    bottom
+
+    atmosphere
     {
-        type            symmetryPlane;
-    }
-    side
-    {
-        type            symmetryPlane;
-    }
-    midPlane
-    {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
+
     hull
     {
         type            nutkRoughWallFunction;
-        Ks              uniform 0.0001;
+        Ks              uniform 100e-6;
         Cs              uniform 0.5;
-        value           uniform 5e-07;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/omega.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/omega.orig
index a47f3828fc..b1d3a65166 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/omega.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/omega.orig
@@ -21,41 +21,36 @@ internalField   uniform 2;
 
 boundaryField
 {
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 2;
-        value           uniform 2;
-    }
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
     inlet
     {
         type            fixedValue;
-        value           uniform 2;
+        value           $internalField;
     }
+
     outlet
+    {
+       type            inletOutlet;
+       inletValue      $internalField;
+       value           $internalField;
+    }
+
+    atmosphere
     {
         type            inletOutlet;
-        inletValue      uniform 2;
-        value           uniform 2;
-    }
-    bottom
-    {
-        type            symmetryPlane;
-    }
-    side
-    {
-        type            symmetryPlane;
-    }
-    midPlane
-    {
-        type            symmetryPlane;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     hull
     {
         type            omegaWallFunction;
-        value           uniform 2;
+        value           $internalField;
     }
 }
 
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
index 5e8ac56f65..6931b64ebf 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
@@ -21,44 +21,31 @@ internalField   uniform 0;
 
 boundaryField
 {
-    atmosphere
-    {
-        type            totalPressure;
-        rho             rho;
-        psi             none;
-        gamma           1;
-        p0              uniform 0;
-        value           uniform 0;
-    }
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
     inlet
     {
         type            fixedFluxPressure;
-        gradient        uniform 0;
-        value           uniform 0;
+        value           $internalField;
     }
+
     outlet
     {
         type            zeroGradient;
     }
-    bottom
+
+    atmosphere
     {
-        type            symmetryPlane;
-    }
-    side
-    {
-        type            symmetryPlane;
-    }
-    midPlane
-    {
-        type            symmetryPlane;
+        type            totalPressure;
+        p0              uniform 0;
     }
+
     hull
     {
         type            fixedFluxPressure;
-        gradient        uniform 0;
-        value           uniform 0;
+        value           $internalField;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/pointDisplacement.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/pointDisplacement.orig
index 1983549b6f..f7837b7724 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/pointDisplacement.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/pointDisplacement.orig
@@ -21,33 +21,27 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    atmosphere
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
+    //- Set patchGroups for constraint patches
+    #includeEtc "caseDicts/setConstraintTypes"
+
     inlet
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
+
     outlet
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
-    bottom
+
+    atmosphere
     {
-        type            symmetryPlane;
-    }
-    side
-    {
-        type            symmetryPlane;
-    }
-    midPlane
-    {
-        type            symmetryPlane;
+        type            fixedValue;
+        value           uniform (0 0 0);
     }
+
     hull
     {
         type            calculated;
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
index 062057e1e1..3c2ad49b22 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution
@@ -38,7 +38,6 @@ solvers
     "pcorr.*"
     {
         solver          GAMG;
-
         smoother        DIC;
 
         tolerance       1e-3;
@@ -48,7 +47,6 @@ solvers
     p_rgh
     {
         solver          GAMG;
-
         smoother        DIC;
 
         tolerance       5e-8;
@@ -64,10 +62,9 @@ solvers
     "(U|k|omega).*"
     {
         solver          smoothSolver;
-
         smoother        symGaussSeidel;
-        nSweeps         1;
 
+        nSweeps         1;
         tolerance       1e-7;
         relTol          0;
         minIter         1;