diff --git a/PWGCF/Core/AnalysisConfigurableCuts.h b/PWGCF/Core/AnalysisConfigurableCuts.h
index 76b7b759f07..aebb6b2f407 100644
--- a/PWGCF/Core/AnalysisConfigurableCuts.h
+++ b/PWGCF/Core/AnalysisConfigurableCuts.h
@@ -151,7 +151,7 @@ class SimpleInclusiveCut : public TNamed
   SimpleInclusiveCut& operator=(const SimpleInclusiveCut&);
 
  private:
-  ClassDef(SimpleInclusiveCut, 1);
+  ClassDefOverride(SimpleInclusiveCut, 1);
 };
 
 } // namespace analysis
diff --git a/PWGCF/GenericFramework/Core/FlowPtContainer.h b/PWGCF/GenericFramework/Core/FlowPtContainer.h
index 96ada820053..904153b7887 100644
--- a/PWGCF/GenericFramework/Core/FlowPtContainer.h
+++ b/PWGCF/GenericFramework/Core/FlowPtContainer.h
@@ -233,6 +233,6 @@ class FlowPtContainer : public TNamed
   void getSubevents(int k, int n, std::vector<int>& current, std::vector<std::vector<int>>& subevents);
   static constexpr std::array<float, 9> FactorialArray = {1., 1., 2., 6., 24., 120., 720., 5040., 40320.};
   static constexpr std::array<int, 9> SignArray = {1, -1, 1, -1, 1, -1, 1, -1, 1};
-  ClassDef(FlowPtContainer, 2);
+  ClassDefOverride(FlowPtContainer, 2);
 };
 #endif // PWGCF_GENERICFRAMEWORK_CORE_FLOWPTCONTAINER_H_
diff --git a/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h b/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
index 5030f011be7..0a0a6aa3e41 100644
--- a/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
+++ b/PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.h
@@ -119,7 +119,7 @@ class EventSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
   CutBrick<float>* mZVertex;                      //! the z vertex selection cuts
   PileUpRejBrick* mPileUpRejection;               //! the pile-up rejection criteria
 
-  ClassDef(EventSelectionFilterAndAnalysis, 1)
+  ClassDefOverride(EventSelectionFilterAndAnalysis, 1)
 };
 
 /// \brief Stores the different multiplicities needed for proper collision filtering
diff --git a/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h b/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
index 9c6d4d5ead0..8d24e4348c8 100644
--- a/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
+++ b/PWGCF/TwoParticleCorrelations/Core/PIDSelectionFilterAndAnalysis.h
@@ -145,7 +145,7 @@ class PIDSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
   std::vector<CutBrick<float>*> mCloseNsigmasTOF;
   std::vector<CutBrick<float>*> mBayesProbability;
 
-  ClassDef(PIDSelectionFilterAndAnalysis, 1);
+  ClassDefOverride(PIDSelectionFilterAndAnalysis, 1);
 };
 
 /// \brief Fills the filter cuts mask
diff --git a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
index 8c3ca4f2094..885b646e906 100644
--- a/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
+++ b/PWGCF/TwoParticleCorrelations/Core/SkimmingConfigurableCuts.h
@@ -98,7 +98,7 @@ class CutBrick : public TNamed
   BrickStatus mState = kPASSIVE;
   BrickMode mMode = kUNSELECTED;
 
-  ClassDef(CutBrick, 1);
+  ClassDefOverride(CutBrick, 1);
 };
 
 /// \class CutBrickLimit
@@ -452,7 +452,7 @@ class CutWithVariations : public CutBrick<TValueToFilter>
   bool mAllowSeveralDefaults; ///< true if allows to store several cut default values
   TList mDefaultBricks;       ///< the list with the cut default values bricks
   TList mVariationBricks;     ///< the list with the cut variation values bricks
-  ClassDef(CutWithVariations, 1);
+  ClassDefOverride(CutWithVariations, 1);
 };
 
 /// \class SpecialCutBrick
@@ -503,7 +503,7 @@ class SpecialCutBrick : public TNamed
   BrickStatus mState = kPASSIVE;
   BrickMode mMode = kUNSELECTED;
 
-  ClassDef(SpecialCutBrick, 1);
+  ClassDefOverride(SpecialCutBrick, 1);
 };
 
 class TrackSelectionBrick : public SpecialCutBrick
@@ -626,7 +626,7 @@ class TrackSelectionBrick : public SpecialCutBrick
   // vector of ITS requirements (minNRequiredHits in specific requiredLayers)
   std::vector<std::pair<int8_t, std::set<uint8_t>>> mRequiredITSHits{};
 
-  ClassDef(TrackSelectionBrick, 1);
+  ClassDefOverride(TrackSelectionBrick, 1);
 };
 
 } // namespace PWGCF