diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
index 0a6076a61e..29758935af 100755
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
@@ -13,8 +13,8 @@ runApplication setFields
 unset FOAM_SIGFPE
 unset FOAM_SETNAN
 
-# Add cyclic baffles for fan
-runApplication setSet -batch selectCyclics.setSet
+# Create faceZones for porous baffles
+runApplication topoSet
 
 createBaffles cyclicZoneFaces '(porous_half0 porous_half1)' -overwrite > log.createBaffles 2>&1
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
new file mode 100644
index 0000000000..cb01338cff
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/topoSetDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    cyclicFaces;
+        type    faceSet;
+        action  new;
+        source  boxToFace;
+        sourceInfo
+        {
+            box (0.3015 0.0493 -1) (0.3069 0.2077 1);
+        }
+    }
+
+    {
+        name    cyclicFacesSlaveCells;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-1 0 -1) (0.305 0.31 1);
+        }
+    }
+
+    {
+        name    cyclicZoneFaces;
+        type    faceZoneSet;
+        action  new;
+        source  setsToFaceZone;
+        sourceInfo
+        {
+            faceSet cyclicFaces;
+            cellSet cyclicFacesSlaveCells;
+        }
+    }
+);
+
+// ************************************************************************* //