diff --git a/L1Trigger/L1TNtuples/plugins/L1UpgradeTfMuonShowerTreeProducer.cc b/L1Trigger/L1TNtuples/plugins/L1UpgradeTfMuonShowerTreeProducer.cc
index 95bca96dbff7d..07fe9bbfeac48 100644
--- a/L1Trigger/L1TNtuples/plugins/L1UpgradeTfMuonShowerTreeProducer.cc
+++ b/L1Trigger/L1TNtuples/plugins/L1UpgradeTfMuonShowerTreeProducer.cc
@@ -3,7 +3,7 @@
 
 // framework
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -23,10 +23,10 @@
 // class declaration
 //
 
-class L1UpgradeTfMuonShowerTreeProducer : public edm::EDAnalyzer {
+class L1UpgradeTfMuonShowerTreeProducer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   explicit L1UpgradeTfMuonShowerTreeProducer(const edm::ParameterSet&);
-  ~L1UpgradeTfMuonShowerTreeProducer() override;
+  ~L1UpgradeTfMuonShowerTreeProducer() override = default;
 
 private:
   void beginJob(void) override;
@@ -58,14 +58,14 @@ L1UpgradeTfMuonShowerTreeProducer::L1UpgradeTfMuonShowerTreeProducer(const edm::
 
   l1UpgradeEmtfData = l1UpgradeEmtf.getData();
 
+  usesResource(TFileService::kSharedResource);
+
   // set up output
   tree_ = fs_->make<TTree>("L1UpgradeTfMuonShowerTree", "L1UpgradeTfMuonShowerTree");
   tree_->Branch(
       "L1UpgradeEmtfMuonShower", "L1Analysis::L1AnalysisL1UpgradeTfMuonShowerDataFormat", &l1UpgradeEmtfData, 32000, 3);
 }
 
-L1UpgradeTfMuonShowerTreeProducer::~L1UpgradeTfMuonShowerTreeProducer() {}
-
 //
 // member functions
 //
diff --git a/L1TriggerConfig/Utilities/src/L1MenuWriter.cc b/L1TriggerConfig/Utilities/src/L1MenuWriter.cc
index cf90d79a5f16c..d669a16a7cee1 100644
--- a/L1TriggerConfig/Utilities/src/L1MenuWriter.cc
+++ b/L1TriggerConfig/Utilities/src/L1MenuWriter.cc
@@ -1,7 +1,7 @@
 #include <iomanip>
 #include <iostream>
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -16,25 +16,31 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 
-class L1MenuWriter : public edm::EDAnalyzer {
+class L1MenuWriter : public edm::one::EDAnalyzer<> {
 private:
   bool isO2Opayload;
 
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
+  const edm::ESGetToken<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd> l1GtMenuToken_;
+  const edm::ESGetToken<L1TUtmTriggerMenu, L1TUtmTriggerMenuO2ORcd> l1GtMenuO2OToken_;
 
-  explicit L1MenuWriter(const edm::ParameterSet& pset) : edm::EDAnalyzer() {
+  explicit L1MenuWriter(const edm::ParameterSet& pset)
+      : edm::one::EDAnalyzer<>(),
+        l1GtMenuToken_(esConsumes<L1TUtmTriggerMenu, L1TUtmTriggerMenuRcd>()),
+        l1GtMenuO2OToken_(esConsumes<L1TUtmTriggerMenu, L1TUtmTriggerMenuO2ORcd>()) {
     isO2Opayload = pset.getUntrackedParameter<bool>("isO2Opayload", false);
   }
-  ~L1MenuWriter(void) override {}
+  ~L1MenuWriter(void) override = default;
 };
 
 void L1MenuWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) {
   edm::ESHandle<L1TUtmTriggerMenu> handle1;
+
   if (isO2Opayload)
-    evSetup.get<L1TUtmTriggerMenuO2ORcd>().get(handle1);
+    handle1 = evSetup.getHandle(l1GtMenuO2OToken_);
   else
-    evSetup.get<L1TUtmTriggerMenuRcd>().get(handle1);
+    handle1 = evSetup.getHandle(l1GtMenuToken_);
 
   std::shared_ptr<L1TUtmTriggerMenu> ptr1(new L1TUtmTriggerMenu(*(handle1.product())));