diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/SkimmingToolEXOT5.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/SkimmingToolEXOT5.cxx
index 9c48d45e72f584a38e9fc4fe19e4e18920f0273c..56cc4a995ed8ab8a19ce8655270c02486c4277c1 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/SkimmingToolEXOT5.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/SkimmingToolEXOT5.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////////
@@ -87,14 +87,14 @@ bool DerivationFramework::SkimmingToolEXOT5::eventPassesFilter() const
   recoJets->setStore(recoJetsAux.get());
 
   std::pair<xAOD::JetContainer*, xAOD::ShallowAuxContainer*> jets_shallowCopy = xAOD::shallowCopyContainer(*jets);
-  for (const auto &jet : *jets_shallowCopy.first) {
+  for (const auto jet : *jets_shallowCopy.first) {
     if (jet->pt() > 100000.) passUncalibMonojetCut = true;
   }
   if (m_jetCalibrationTool->applyCalibration(*jets_shallowCopy.first).isFailure()) {
     ATH_MSG_ERROR("Problem applying jet calibration");
     return false;
   }
-  for (const auto &jet : *jets_shallowCopy.first) {
+  for (const auto jet : *jets_shallowCopy.first) {
     xAOD::Jet* newJet = new xAOD::Jet();
     newJet->makePrivateStore(*jet);
     recoJets->push_back(newJet);
@@ -120,7 +120,7 @@ bool DerivationFramework::SkimmingToolEXOT5::eventPassesFilter() const
     std::unique_ptr<xAOD::JetAuxContainer> truthJetsAux = make_unique<xAOD::JetAuxContainer>();
     truthJets->setStore(truthJetsAux.get());
 
-    for (const auto &truthJet : *truthJetContainer) {
+    for (const auto truthJet : *truthJetContainer) {
       xAOD::Jet* newTruthJet = new xAOD::Jet();
       newTruthJet->makePrivateStore(*truthJet);
       truthJets->push_back(newTruthJet);
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx
index d30f31ef54a0cd091fc1b531526bf0ee448495f2..79a8aa495e350568018e8ebce6adc205c607cbac 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackStateOnSurfaceDecorator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -322,7 +322,7 @@ namespace DerivationFramework {
     std::vector<SG::WriteDecorHandle<xAOD::TrackParticleContainer,float> >
        trackPixFloatDecorators = createDecorators<xAOD::TrackParticleContainer,float>(m_trackPixFloatDecorKeys,ctx);
     // -- Run over each track and decorate it
-    for (const auto& track : *tracks) {
+    for (const auto track : *tracks) {
       //-- Start with things that do not need a Trk::Track object
 
       // -- Now things that require a Trk::Track object
@@ -410,7 +410,7 @@ namespace DerivationFramework {
 
       // -- Add Track states to the current track, filtering on their type
       std::vector<const Trk::TrackStateOnSurface*> tsoss;
-      for (const auto& trackState: *(trkTrack->trackStateOnSurfaces())){
+      for (const auto trackState: *(trkTrack->trackStateOnSurfaces())){
         //Get rid of any holes that already exist  --  we are doing the search again
         if( trackState->types()[Trk::TrackStateOnSurface::Hole] )
           continue;
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackToVertexWrapper.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackToVertexWrapper.cxx
index f3d8f93a67f732c35d3d20b27ee690abd3be8d56..b45f67c4699ca8132d625271b13b46be124c20f6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackToVertexWrapper.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/TrackToVertexWrapper.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -93,7 +93,7 @@ namespace DerivationFramework {
       std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigma;
       std::unique_ptr<const Trk::ImpactParametersAndSigma> iPandSigmaBiased;
       const xAOD::Vertex* foundVertex { nullptr };
-      for (const auto& vx : *vertices)
+      for (const auto vx : *vertices)
       {
 	for (const auto& tpLink : vx->trackParticleLinks())
 	{
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/VertexDecoratorAlg.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/VertexDecoratorAlg.cxx
index 527e745772b50a88f9aeb677610a1aa690644bef..1b43cd95dac07654a014c40930c4dd10ae86b1a6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/VertexDecoratorAlg.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/VertexDecoratorAlg.cxx
@@ -35,7 +35,7 @@ StatusCode VertexDecoratorAlg::execute() {
     ATH_MSG_DEBUG("in execute");
     const xAOD::VertexContainer* Vertices = nullptr;
     ATH_CHECK(evtStore()->retrieve(Vertices, m_VertexContainer));
-    for (const auto& vertex  : *Vertices ){
+    for (const auto vertex  : *Vertices ){
         unsigned int n_Trks = 0;
         float sum_pt = 0;
         for (unsigned int t = 0 ; t < vertex->nTrackParticles(); ++t){