diff --git a/Data/Templates/case/Allrun b/Data/Templates/case/Allrun
index 217a146a..9654bc1b 100644
--- a/Data/Templates/case/Allrun
+++ b/Data/Templates/case/Allrun
@@ -181,7 +181,13 @@ fi
 %{%(initialisationZonesPresent%)
 %:True
 # Set internal fields according to setFieldsDict
-runCommand setFields
+# use the OF13 dict for setFields if using openfoam 13 and later
+if [ "$WM_PROJECT_VERSION" -ge 13 ] && [ "${WM_PROJECT_VERSION:0:1}" != "v" ]
+then
+	runCommand setFields -dict system/setFieldsDict_OF13
+else
+	runCommand setFields
+fi
 
 %}
 %{%(bafflesPresent%)
diff --git a/Data/Templates/case/Allrun.ps1 b/Data/Templates/case/Allrun.ps1
index 6e3664a2..86b8d45e 100644
--- a/Data/Templates/case/Allrun.ps1
+++ b/Data/Templates/case/Allrun.ps1
@@ -179,7 +179,15 @@ else
 %{%(initialisationZonesPresent%)
 %:True
 # Set internal fields according to setFieldsDict
-runCommand setFields
+# use the OF13 dict for setFields if using openfoam 13 and later
+if ( $Env:WM_PROJECT_VERSION[0] -ne "v" -and 13 -le $Env:WM_PROJECT_VERSION )
+{
+	runCommand setFields -dict system/setFieldsDict_OF13
+}
+else
+{
+	runCommand setFields
+}
 
 %}
 %{%(bafflesPresent%)
diff --git a/Data/Templates/case/constant/dynamicMeshDict b/Data/Templates/case/constant/dynamicMeshDict
index 28a2cc0c..b42afa0f 100644
--- a/Data/Templates/case/constant/dynamicMeshDict
+++ b/Data/Templates/case/constant/dynamicMeshDict
@@ -76,7 +76,7 @@ dynamicRefineFvMeshCoeffs
 topoChanger
 {
     type refiner;
-    libs            ("libfvMeshTopoChangers" "libhisaMeshRebalancing");
+    libs            ("libfvMeshTopoChangers.so" "libhisaMeshRebalancing.so");
 
 %{%(dynamicMesh/Type%)
 %:interface
diff --git a/Data/Templates/case/system/setFieldsDict_OF13 b/Data/Templates/case/system/setFieldsDict_OF13
new file mode 100644
index 00000000..59570f8d
--- /dev/null
+++ b/Data/Templates/case/system/setFieldsDict_OF13
@@ -0,0 +1,106 @@
+%{%(initialisationZonesPresent%)
+%:True
+%[_header%]
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultValues
+{
+}
+
+zones
+{
+
+%{%(initialisationZones%)
+%{%(zones/%(0%)/PartNameList%)
+    %(0%)
+    {
+		type insideSurface;
+		zoneType cell;
+        surface triSurface;
+        file "%(0%).stl";
+        values
+        {
+%{%(initialisationZones/%(1%)%)
+%{%(0%)
+%:Ux
+            U ( %(initialisationZones/%(2%)/Ux%) %(initialisationZones/%(2%)/Uy%) %(initialisationZones/%(2%)/Uz%) );
+%:Uy
+%:Uz
+%:Pressure
+%{%(solver/SolverName%)
+%:interFoam multiphaseInterFoam
+            p_rgh %(initialisationZones/%(2%)/Pressure%);
+%:simpleFoam porousSimpleFoam pimpleFoam SRFSimpleFoam
+            p %(initialisationZones/%(2%)/KinematicPressure%);
+%:default
+            p %(initialisationZones/%(2%)/Pressure%);
+%}
+%:Temperature
+%{%(physics/Flow%)
+%:Isothermal
+%:default
+            T %(initialisationZones/%(2%)/Temperature%);
+%}
+%:VolumeFractions
+%{%(solver/SolverName%)
+%:interFoam multiphaseInterFoam
+%{%(initialisationZones/%(2%)/VolumeFractions%)
+            alpha.%(0%) %(initialisationZones/%(3%)/VolumeFractions/%(0%)%);
+%}
+%}
+%}
+%}
+        }
+    }
+
+    cellToFace
+    {
+		type insideSurface;
+		zoneType face;
+        surface triSurface;
+        file "%(0%).stl";
+        values
+        {
+%{%(initialisationZones/%(1%)%)
+%{%(0%)
+%:Ux
+            U ( %(initialisationZones/%(2%)/Ux%) %(initialisationZones/%(2%)/Uy%) %(initialisationZones/%(2%)/Uz%) );
+%:Uy
+%:Uz
+%:Pressure
+%{%(solver/SolverName%)
+%:interFoam multiphaseInterFoam
+            p_rgh %(initialisationZones/%(2%)/Pressure%);
+%:simpleFoam porousSimpleFoam pimpleFoam
+            p %(initialisationZones/%(2%)/KinematicPressure%);
+%:default
+            p %(initialisationZones/%(2%)/Pressure%);
+%}
+%:Temperature
+            T %(initialisationZones/%(2%)/Temperature%);
+%:VolumeFractions
+%{%(solver/SolverName%)
+%:interFoam multiphaseInterFoam
+%{%(initialisationZones/%(2%)/VolumeFractions%)
+            alpha.%(0%) %(initialisationZones/%(3%)/VolumeFractions/%(0%)%);
+%}
+%}
+%}
+%}
+        }
+    }
+%}
+%}
+}
+
+// ************************************************************************* //
+
+%}
diff --git a/Data/TestFiles/cases/DamBreak3D/case/Allrun b/Data/TestFiles/cases/DamBreak3D/case/Allrun
index f355d813..e6c879d3 100755
--- a/Data/TestFiles/cases/DamBreak3D/case/Allrun
+++ b/Data/TestFiles/cases/DamBreak3D/case/Allrun
@@ -79,7 +79,13 @@ runCommand createPatch -overwrite
 runCommand topoSet -dict system/topoSetZonesDict
 
 # Set internal fields according to setFieldsDict
-runCommand setFields
+# use the OF13 dict for setFields if using openfoam 13 and later
+if [ "$WM_PROJECT_VERSION" -ge 13 ] && [ "${WM_PROJECT_VERSION:0:1}" != "v" ]
+then
+	runCommand setFields -dict system/setFieldsDict_OF13
+else
+	runCommand setFields
+fi
 
 # Parallel decomposition
 if [ ! -d processor0 ]
diff --git a/Data/TestFiles/cases/DamBreak3D/case/Allrun.ps1 b/Data/TestFiles/cases/DamBreak3D/case/Allrun.ps1
index d4a6373c..10ce2194 100644
--- a/Data/TestFiles/cases/DamBreak3D/case/Allrun.ps1
+++ b/Data/TestFiles/cases/DamBreak3D/case/Allrun.ps1
@@ -69,7 +69,15 @@ runCommand createPatch -overwrite
 runCommand topoSet -dict system/topoSetZonesDict
 
 # Set internal fields according to setFieldsDict
-runCommand setFields
+# use the OF13 dict for setFields if using openfoam 13 and later
+if ( $Env:WM_PROJECT_VERSION[0] -ne "v" -and 13 -le $Env:WM_PROJECT_VERSION )
+{
+	runCommand setFields -dict system/setFieldsDict_OF13
+}
+else
+{
+	runCommand setFields
+}
 
 # Parallel decomposition
 if( !(Test-Path -PathType Container processor0) )
diff --git a/Data/TestFiles/cases/DamBreak3D/case/constant/dynamicMeshDict b/Data/TestFiles/cases/DamBreak3D/case/constant/dynamicMeshDict
index a4344dba..22002667 100644
--- a/Data/TestFiles/cases/DamBreak3D/case/constant/dynamicMeshDict
+++ b/Data/TestFiles/cases/DamBreak3D/case/constant/dynamicMeshDict
@@ -53,7 +53,7 @@ dynamicRefineFvMeshCoeffs
 topoChanger
 {
     type refiner;
-    libs            ("libfvMeshTopoChangers" "libhisaMeshRebalancing");
+    libs            ("libfvMeshTopoChangers.so" "libhisaMeshRebalancing.so");
 
     refineInterval  5;
     field           alpha.water;
diff --git a/Data/TestFiles/cases/DamBreak3D/case/system/setFieldsDict_OF13 b/Data/TestFiles/cases/DamBreak3D/case/system/setFieldsDict_OF13
new file mode 100644
index 00000000..cf215665
--- /dev/null
+++ b/Data/TestFiles/cases/DamBreak3D/case/system/setFieldsDict_OF13
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+|                                                                             |
+|                Generated by the CfdOF workbench for FreeCAD                 |
+|                      https://github.com/jaheyns/CfdOF                       |
+|                                                                             |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultValues
+{
+}
+
+zones
+{
+
+    Box002
+    {
+		type insideSurface;
+		zoneType cell;
+        surface triSurface;
+        file "Box002.stl";
+        values
+        {
+            alpha.water 1.0;
+        }
+    }
+
+    cellToFace
+    {
+		type insideSurface;
+		zoneType face;
+        surface triSurface;
+        file "Box002.stl";
+        values
+        {
+            alpha.water 1.0;
+        }
+    }
+}
+
+// ************************************************************************* //
+