diff --git a/dumux/freeflow/navierstokes/model.hh b/dumux/freeflow/navierstokes/model.hh
index cd828f6b1766ea9e4d307a8da19b3d1b7f6c1262..7fc7b2029c74e7525d770a36009a712f5d264bce 100644
--- a/dumux/freeflow/navierstokes/model.hh
+++ b/dumux/freeflow/navierstokes/model.hh
@@ -148,10 +148,9 @@ public:
 SET_PROP(NavierStokes, VtkOutputFields)
 {
 private:
-    using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
     using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
 public:
-     using type = NavierStokesVtkOutputFields<FaceVariables, FVGridGeometry>;
+     using type = NavierStokesVtkOutputFields<FVGridGeometry>;
 };
 //////////////////////////////////////////////////////////////////
 // Property values for isothermal model required for the general non-isothermal model
@@ -170,10 +169,9 @@ public:
 SET_PROP(NavierStokesNI, IsothermalVtkOutputFields)
 {
 private:
-    using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
     using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
 public:
-     using type = NavierStokesVtkOutputFields<FaceVariables, FVGridGeometry>;
+     using type = NavierStokesVtkOutputFields<FVGridGeometry>;
 };
 
 //! The number of equations for the isothermal model
diff --git a/dumux/freeflow/navierstokes/vtkoutputfields.hh b/dumux/freeflow/navierstokes/vtkoutputfields.hh
index 72ec0035901b350ebe925110294a3679c0a7490a..c13234c31055b9c13ff6184a1789b787906e4179 100644
--- a/dumux/freeflow/navierstokes/vtkoutputfields.hh
+++ b/dumux/freeflow/navierstokes/vtkoutputfields.hh
@@ -36,10 +36,11 @@ namespace Dumux
  * \ingroup NavierStokesModel
  * \brief Adds vtk output fields for the Navier-Stokes model
  */
-template<class FaceVariables, class FVGridGeometry>
+template<class FVGridGeometry>
 class NavierStokesVtkOutputFields
 {
-    using GlobalPosition = Dune::FieldVector<typename FaceVariables::Scalar, FVGridGeometry::GridView::dimensionworld>;
+    using ctype = typename FVGridGeometry::GridView::ctype;
+    using GlobalPosition = Dune::FieldVector<ctype, FVGridGeometry::GridView::dimensionworld>;
 
     // Helper type used for tag dispatching (to add discretization-specific fields).
     template<DiscretizationMethod discMethod>
@@ -70,10 +71,10 @@ private:
         const bool writeFaceVars = getParamFromGroup<bool>(vtk.paramGroup(), "Vtk.WriteFaceData", false);
         if(writeFaceVars)
         {
-            auto faceVelocityVector = [](const typename FVGridGeometry::SubControlVolumeFace& scvf, const FaceVariables& f)
+            auto faceVelocityVector = [](const typename FVGridGeometry::SubControlVolumeFace& scvf, const auto& faceVars)
                                       {
                                           GlobalPosition velocity(0.0);
-                                          velocity[scvf.directionIndex()] = f.velocitySelf();
+                                          velocity[scvf.directionIndex()] = faceVars.velocitySelf();
                                           return velocity;
                                       };
 
diff --git a/dumux/freeflow/navierstokesnc/model.hh b/dumux/freeflow/navierstokesnc/model.hh
index 6654b264da1e682d8aa23c7ede129e9badccb192..d3468ef03ca839ede566b72dea4c90c73da0f3a0 100644
--- a/dumux/freeflow/navierstokesnc/model.hh
+++ b/dumux/freeflow/navierstokesnc/model.hh
@@ -159,12 +159,11 @@ public:
 SET_PROP(NavierStokesNC, VtkOutputFields)
 {
 private:
-    using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
     using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
     using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
     static constexpr int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
 public:
-     using type = NavierStokesNCVtkOutputFields<FaceVariables, FVGridGeometry, FluidSystem, phaseIdx>;
+     using type = NavierStokesNCVtkOutputFields<FVGridGeometry, FluidSystem, phaseIdx>;
 };
 
 /*!
@@ -205,12 +204,11 @@ public:
 SET_PROP(NavierStokesNCNI, IsothermalVtkOutputFields)
 {
 private:
-    using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
     using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
     using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
     static constexpr int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
 public:
-     using type = NavierStokesNCVtkOutputFields<FaceVariables, FVGridGeometry, FluidSystem, phaseIdx>;
+     using type = NavierStokesNCVtkOutputFields<FVGridGeometry, FluidSystem, phaseIdx>;
 };
 
 //! The number of equations for the isothermal model
diff --git a/dumux/freeflow/navierstokesnc/vtkoutputfields.hh b/dumux/freeflow/navierstokesnc/vtkoutputfields.hh
index 391d8c8add4c7be100a0a004634d0eaed59ad29b..2ffa7778ef8b346d7892db4257e652822a1d953e 100644
--- a/dumux/freeflow/navierstokesnc/vtkoutputfields.hh
+++ b/dumux/freeflow/navierstokesnc/vtkoutputfields.hh
@@ -34,7 +34,7 @@ namespace Dumux
  * \ingroup NavierStokesNCModel
  * \brief Adds vtk output fields specific to the NavierStokesNC model
  */
-template<class FaceVariables, class FVGridGeometry, class FluidSystem, int phaseIdx>
+template<class FVGridGeometry, class FluidSystem, int phaseIdx>
 class NavierStokesNCVtkOutputFields
 {
 
@@ -43,7 +43,7 @@ public:
     template <class VtkOutputModule>
     static void init(VtkOutputModule& vtk)
     {
-        NavierStokesVtkOutputFields<FaceVariables, FVGridGeometry>::init(vtk);
+        NavierStokesVtkOutputFields<FVGridGeometry>::init(vtk);
 
         vtk.addVolumeVariable([](const auto& v){ return v.molarDensity(); }, "rhoMolar");
         vtk.addVolumeVariable([](const auto& v){ return v.density(); }, "rho");
diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh
index b31595e3508e0082e63e9785fdc069da53935bf5..fd21d18ef29a7d57bd98d7d5581d0f34a95a5ed4 100644
--- a/dumux/io/staggeredvtkoutputmodule.hh
+++ b/dumux/io/staggeredvtkoutputmodule.hh
@@ -92,7 +92,7 @@ public:
                     const std::string& paramGroup = "",
                     bool verbose = true,
                     Dune::VTK::DataMode dm = Dune::VTK::conforming)
-    : ParentType(problem, fvGridGeometry, gridVariables, sol, name, paramGroup,verbose, dm)
+    : ParentType(problem, fvGridGeometry, gridVariables, sol, name, paramGroup, verbose, dm)
     , problem_(problem)
     , gridGeom_(fvGridGeometry)
     , gridVariables_(gridVariables)