diff --git a/ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx b/ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx
index 4340bf9bc33..1b0a1a4fb6f 100644
--- a/ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx
+++ b/ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx
@@ -20,6 +20,7 @@
 #include "ALICE3/Core/TrackUtilities.h"
 #include "ALICE3/DataModel/tracksAlice3.h"
 
+#include <CommonConstants/PhysicsConstants.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
@@ -47,13 +48,19 @@
 using namespace o2;
 using namespace o2::framework;
 
-static constexpr int NumDecays = 7;
+static constexpr int NumDecays = 13;
 static constexpr int NumParameters = 1;
-static constexpr int DefaultParameters[NumDecays][NumParameters]{{1}, {1}, {1}, {1}, {1}, {1}, {1}};
+static constexpr std::array<std::array<int, NumParameters>, NumDecays> DefaultParameters{{{1}, {1}, {1}, {1}, {1}, {1}, {1}, {1}, {1}, {1}, {1}, {1}, {1}}};
 static const std::vector<std::string> parameterNames{"enable"};
 static const std::vector<std::string> particleNames{"K0s",
                                                     "Lambda",
                                                     "Anti-Lambda",
+                                                    "SigmaPlus",
+                                                    "Anti-SigmaPlus",
+                                                    "SigmaMinus",
+                                                    "Anti-SigmaMinus",
+                                                    "Xi0",
+                                                    "Anti-Xi0",
                                                     "Xi",
                                                     "Anti-Xi",
                                                     "Omega",
@@ -62,6 +69,12 @@ static const std::vector<std::string> particleNames{"K0s",
 static const std::vector<int> pdgCodes{PDG_t::kK0Short,
                                        PDG_t::kLambda0,
                                        PDG_t::kLambda0Bar,
+                                       PDG_t::kSigmaPlus,
+                                       PDG_t::kSigmaBarMinus,
+                                       PDG_t::kSigmaMinus,
+                                       PDG_t::kSigmaBarPlus,
+                                       o2::constants::physics::kXi0,
+                                       -o2::constants::physics::kXi0,
                                        PDG_t::kXiMinus,
                                        PDG_t::kXiPlusBar,
                                        PDG_t::kOmegaMinus,
@@ -78,13 +91,13 @@ struct OnTheFlyDecayer {
   Produces<aod::OTFDecayerBits> tableOTFDecayerBits;
 
   o2::upgrade::Decayer decayer;
-  Service<o2::framework::O2DatabasePDG> pdgDB;
+  Service<o2::framework::O2DatabasePDG> pdgDB{};
   HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
 
   Configurable<int> seed{"seed", 0, "Set seed for particle decayer"};
   Configurable<float> magneticField{"magneticField", 20., "Magnetic field (kG)"};
   Configurable<LabeledArray<int>> enabledDecays{"enabledDecays",
-                                                {DefaultParameters[0], NumDecays, NumParameters, particleNames, parameterNames},
+                                                {DefaultParameters[0].data(), NumDecays, NumParameters, particleNames, parameterNames},
                                                 "Enable option for particle to be decayed: 0 - no, 1 - yes"};
 
   std::size_t indexOffset = 0;
@@ -99,7 +112,7 @@ struct OnTheFlyDecayer {
     decayer.setSeed(seed);
     decayer.setBField(magneticField);
     for (int i = 0; i < NumDecays; ++i) {
-      if (enabledDecays->get(particleNames[i].c_str(), "enable")) {
+      if (enabledDecays->get(particleNames[i].c_str(), "enable") != 0) {
         LOG(info) << " --- Decay enabled: " << pdgCodes[i];
         mEnabledDecays.push_back(pdgCodes[i]);
       }
@@ -146,9 +159,9 @@ struct OnTheFlyDecayer {
 
       const float decayRadius = decayer.getDecayRadius();
       const float trackVelocity = o2::upgrade::computeParticleVelocity(particle.p(), pdgDB->GetParticle(particle.pdgCode())->Mass());
-      const int charge = pdgDB->GetParticle(particle.pdgCode())->Charge() / 3;
+      const int charge = static_cast<int>(pdgDB->GetParticle(particle.pdgCode())->Charge() / 3);
       float trackLength{-1.f};
-      if (!charge) {
+      if (charge == 0) {
         const float dx = particle.vx() - decayer.getSecondaryVertexX();
         const float dy = particle.vy() - decayer.getSecondaryVertexY();
         const float dz = particle.vz() - decayer.getSecondaryVertexZ();