diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
index 8d89c5dcacabcaaef364b05e157372ba3b3772e6..5eaaa6eaa60d5c38084783c5f44ab82caeea4300 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
@@ -145,14 +145,31 @@ private:
   Gaudi::Property<bool> m_StoreMCSOS{
     this,
     "StoreMCSOS",
-    false,
-    "Store multicomponent state or single state in final trajectory"
+    true,
+    "Store Multicomponent State (preferred if we slim later on) or Single "
+    "state in final trajectory"
   };
 
-  bool m_reintegrateOutliers;
-  bool m_makePerigee;
-  bool m_refitOnMeasurementBase;
-  bool m_doHitSorting;
+  Gaudi::Property<bool> m_reintegrateOutliers{ this,
+                                               "ReintegrateOutliers",
+                                               true,
+                                               "Reintegrate Outliers" };
+
+  Gaudi::Property<bool> m_makePerigee{ this,
+                                       "MakePerigee",
+                                       true,
+                                       "Make Perigee" };
+
+  Gaudi::Property<bool> m_refitOnMeasurementBase{ this,
+                                                  "RefitOnMeasurementBase",
+                                                  true,
+                                                  "Refit On Measurement Base" };
+
+  Gaudi::Property<bool> m_doHitSorting{ this,
+                                        "DoHitSorting",
+                                        true,
+                                        "Do Hit Sorting" };
+
   PropDirection m_directionToPerigee;
   std::unique_ptr<TrkParametersComparisonFunction>
     m_trkParametersComparisonFunction;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
index ce2565120e1ac665769fe33747baff89671299a3..3a8d3e982c2deaa87acfef457a2494a7568301f0 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
@@ -40,10 +40,6 @@ Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type,
                                           const std::string& name,
                                           const IInterface* parent)
   : AthAlgTool(type, name, parent)
-  , m_reintegrateOutliers(false)
-  , m_makePerigee(true)
-  , m_refitOnMeasurementBase(true)
-  , m_doHitSorting(true)
   , m_directionToPerigee(Trk::oppositeMomentum)
   , m_trkParametersComparisonFunction(nullptr)
   , m_inputPreparator(nullptr)
@@ -55,13 +51,7 @@ Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type,
   , m_fitQualityFailure{ 0 }
   , m_fitSuccess{ 0 }
 {
-
   declareInterface<ITrackFitter>(this);
-
-  declareProperty("ReintegrateOutliers", m_reintegrateOutliers);
-  declareProperty("MakePerigee", m_makePerigee);
-  declareProperty("RefitOnMeasurementBase", m_refitOnMeasurementBase);
-  declareProperty("DoHitSorting", m_doHitSorting);
   declareProperty("SortingReferencePoint", m_sortingReferencePoint);
   // Estrablish reference point as origin
   m_sortingReferencePoint.push_back(0.);