diff --git a/PWGUD/TableProducer/CMakeLists.txt b/PWGUD/TableProducer/CMakeLists.txt
index 8ed600990ffce..98a98a0134a9d 100644
--- a/PWGUD/TableProducer/CMakeLists.txt
+++ b/PWGUD/TableProducer/CMakeLists.txt
@@ -20,6 +20,6 @@ o2physics_add_dpl_workflow(dgbccand-producer
                            COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(upccand-producer
-                           SOURCES UPCandidateProducer.cxx
+                           SOURCES UPCCandidateProducer.cxx
                            PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB
                            COMPONENT_NAME Analysis)
diff --git a/PWGUD/TableProducer/UPCandidateProducer.cxx b/PWGUD/TableProducer/UPCCandidateProducer.cxx
similarity index 99%
rename from PWGUD/TableProducer/UPCandidateProducer.cxx
rename to PWGUD/TableProducer/UPCCandidateProducer.cxx
index 76d3c14735c46..c8fe59a271eea 100644
--- a/PWGUD/TableProducer/UPCandidateProducer.cxx
+++ b/PWGUD/TableProducer/UPCCandidateProducer.cxx
@@ -425,7 +425,7 @@ struct UpcCandProducer {
   template <typename TTrack, typename TAmbTracks>
   uint64_t getTrackBC(TTrack track,
                       TAmbTracks* ambTracks,
-                      std::unordered_map<int32_t, int32_t> ambTrIDs,
+                      std::unordered_map<int32_t, int32_t>& ambTrIDs,
                       o2::aod::Collisions const& collisions,
                       o2::aod::BCs const& bcs)
   {
@@ -942,6 +942,7 @@ struct UpcCandProducer {
   {
     fDoMC = true;
     fDoSemiFwd = true;
+    skimMCInfo(mcCollisions, mcParticles, bcs);
     createCandidates(&fwdTracks, &barrelTracks,
                      &ambFwdTracks, &ambTracks,
                      bcs, collisions,
@@ -963,6 +964,7 @@ struct UpcCandProducer {
   {
     fDoMC = true;
     fDoSemiFwd = false;
+    skimMCInfo(mcCollisions, mcParticles, bcs);
     createCandidates((ForwardTracks*)nullptr, &barrelTracks,
                      (o2::aod::AmbiguousFwdTracks*)nullptr, &ambBarrelTracks,
                      bcs, collisions,