diff --git a/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc b/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc
index d3864043a5df3..6f36926cf2746 100644
--- a/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc
+++ b/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc
@@ -38,7 +38,7 @@ class PPSTimingCalibrationWriter : public edm::one::EDAnalyzer<> {
 
 void PPSTimingCalibrationWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // get timing calibration parameters
-  const auto hTimingCalib = &iSetup.getData(tokenCalibration_);
+  const auto& hTimingCalib = iSetup.getData(tokenCalibration_);
   // store the calibration into a DB object
   edm::Service<cond::service::PoolDBOutputService> poolDbService;
   if (poolDbService.isAvailable())
diff --git a/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc b/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc
index 6337fc0e11ae0..2b5b96b6b66fd 100644
--- a/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc
+++ b/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc
@@ -49,7 +49,7 @@ class WriteCTPPSBeamParameters : public edm::one::EDAnalyzer<> {
 //---------------------------------------------------------------------------------------
 
 void WriteCTPPSBeamParameters::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-  const auto beamParam = &iSetup.getData(tokenBeamParameters_);
+  const auto& beamParam = iSetup.getData(tokenBeamParameters_);
   // Using "lumiid" as IOV
   const edm::LuminosityBlock& iLBlock = iEvent.getLuminosityBlock();
   edm::LuminosityBlockID lu(iLBlock.run(), iLBlock.id().luminosityBlock());
diff --git a/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc b/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc
index 5db19b00be0ae..3c7d0140379ce 100644
--- a/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc
+++ b/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc
@@ -68,7 +68,7 @@ void WriteCTPPSPixelAnalysisMask::analyze(const edm::Event &, edm::EventSetup co
 
   // Write Analysis Mask to sqlite file:
 
-  const auto analysisMask = &es.getData(tokenAnalysisMask_);
+  const auto& analysisMask = es.getData(tokenAnalysisMask_);
   edm::Service<cond::service::PoolDBOutputService> poolDbService;
   if (poolDbService.isAvailable()) {
     poolDbService->writeOneIOV(analysisMask, analysismaskiov_, record_);
diff --git a/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc b/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc
index c3963ffbb3e88..684a8e56d3efa 100644
--- a/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc
+++ b/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc
@@ -67,7 +67,7 @@ void WriteCTPPSPixelDAQMapping::analyze(const edm::Event &, edm::EventSetup cons
 
   // Write DAQ Mapping to sqlite file:
 
-  const auto mapping = &es.getData(tokenMapping_);
+  const auto& mapping = es.getData(tokenMapping_);
 
   edm::Service<cond::service::PoolDBOutputService> poolDbService;
   if (poolDbService.isAvailable()) {