diff --git a/MC/config/PWGEM/ini/Pythia8_Beauty_Cocktail.ini b/MC/config/PWGEM/ini/Pythia8_Beauty_Cocktail.ini
index ffc32dca6..a1b41e14a 100644
--- a/MC/config/PWGEM/ini/Pythia8_Beauty_Cocktail.ini
+++ b/MC/config/PWGEM/ini/Pythia8_Beauty_Cocktail.ini
@@ -1,6 +1,6 @@
 [GeneratorExternal]
 fileName = ${O2DPG_ROOT}/MC/config/PWGEM/external/generator/Generator_pythia8_forcedDecays.C
-funcName=GeneratePythia8ForcedDecays("411;421;431;4122;4232;4132;4332;511;521;531;5122;5132;5232;5332")
+funcName=GeneratePythia8ForcedDecays("411;421;431;4122;4232;4132;4332;")
 
 [GeneratorPythia8]
 config = ${O2DPG_ROOT}/MC/config/PWGEM/pythia8/generator/pythia8_hf_cocktail.cfg
@@ -10,4 +10,4 @@ includePartonEvent=true
 
 [DecayerPythia8]
 config[0] = ${O2DPG_ROOT}/MC/config/common/pythia8/decayer/base.cfg
-config[1] = ${O2DPG_ROOT}/MC/config/PWGEM/pythia8/decayer/force_semileptonic.cfg
+config[1] = ${O2DPG_ROOT}/MC/config/PWGEM/pythia8/decayer/force_semileptonic_charm.cfg
diff --git a/MC/config/PWGEM/ini/Pythia8_Charm_Cocktail.ini b/MC/config/PWGEM/ini/Pythia8_Charm_Cocktail.ini
index 57f79129d..23f36b30c 100644
--- a/MC/config/PWGEM/ini/Pythia8_Charm_Cocktail.ini
+++ b/MC/config/PWGEM/ini/Pythia8_Charm_Cocktail.ini
@@ -10,4 +10,4 @@ includePartonEvent=true
 
 [DecayerPythia8]
 config[0] = ${O2DPG_ROOT}/MC/config/common/pythia8/decayer/base.cfg
-config[1] = ${O2DPG_ROOT}/MC/config/PWGEM/pythia8/decayer/force_semileptonic.cfg
+config[1] = ${O2DPG_ROOT}/MC/config/PWGEM/pythia8/decayer/force_semileptonic_charm.cfg
diff --git a/MC/config/PWGEM/ini/tests/Pythia8_Beauty_Cocktail.C b/MC/config/PWGEM/ini/tests/Pythia8_Beauty_Cocktail.C
index 42efb8fd8..ef3c3929e 100644
--- a/MC/config/PWGEM/ini/tests/Pythia8_Beauty_Cocktail.C
+++ b/MC/config/PWGEM/ini/tests/Pythia8_Beauty_Cocktail.C
@@ -1,6 +1,6 @@
 int External()
 {
-    	
+    
     std::string path{"o2sim_Kine.root"};
     TFile file(path.c_str(), "READ");
     if (file.IsZombie()) {
@@ -24,11 +24,11 @@ int External()
             if (pdg == -5){
                 found_bbar = true;
             }
-            if ( abs(pdg) == 511 || abs(pdg) == 521 || abs(pdg) == 531 || abs(pdg) == 5122 || abs(pdg) == 5132 || abs(pdg) == 5232 || abs(pdg) == 5332){
+            if ( abs(pdg) == 411 || abs(pdg) == 421 || abs(pdg) == 431 || abs(pdg) == 4122 || abs(pdg) == 4232 || abs(pdg) == 4132 || abs(pdg) == 4332){
                 int ifirstdaughter = track.getFirstDaughterTrackId();
                 int ilastdaughter = track.getLastDaughterTrackId();
                 if (ifirstdaughter == -1 || ilastdaughter == -1){
-                    std::cerr << "Found beauty hadron that does not have daughters" << "\n";
+                    std::cerr << "Found charm hadron that does not have daughters" << "\n";
                     return 1;
                 }
                 bool found_electron = false;
@@ -47,7 +47,7 @@ int External()
                     }
                 }
                 if (!found_electron){
-                    std::cerr << "Found beauty hadron that does not decay to electron" << "\n";
+                    std::cerr << "Found charm hadron that does not decay to electron" << "\n";
                     return 1;
                 }
             }
@@ -56,6 +56,6 @@ int External()
             std::cerr << "Found event without b-bbar pair" << "\n";
             return 1;
         }
-	}
+    }
     return 0;
 }
diff --git a/MC/config/PWGEM/pythia8/decayer/force_semileptonic.cfg b/MC/config/PWGEM/pythia8/decayer/force_semileptonic_beauty.cfg
similarity index 75%
rename from MC/config/PWGEM/pythia8/decayer/force_semileptonic.cfg
rename to MC/config/PWGEM/pythia8/decayer/force_semileptonic_beauty.cfg
index 8cf853b1e..a9f15fff9 100644
--- a/MC/config/PWGEM/pythia8/decayer/force_semileptonic.cfg
+++ b/MC/config/PWGEM/pythia8/decayer/force_semileptonic_beauty.cfg
@@ -1,25 +1,3 @@
-### only semileptonic decays for charm
-### D+
-411:oneChannel = 1 0.087 0 -311 -11 12
-411:addChannel = 1 0.040 0 -321 211 -11 12
-411:addChannel = 1 0.037 0 -313 -11 12
-### D0
-421:oneChannel = 1 0.035 0 -321 -11 12
-421:addChannel = 1 0.022 0 -323 -11 12
-421:addChannel = 1 0.016 0 -321 111 -11 12
-421:addChannel = 1 0.014 0 -311 -211 -11 12
-### Ds
-431:oneChannel = 1 0.025 0 333 -11 12
-431:addChannel = 1 0.027 0 221 -11 12
-### Lambdac
-4122:oneChannel = 1 0.036 0 3122 -11 12
-### chi_{c}^{+}
-4232:oneChannel = 1 0.07 0 3322 -11 12
-### chi_{c}^{0}
-4132:oneChannel = 1 0.014 0 3312 -11 12
-### Omega_{c}
-4332:oneChannel = 1 0.01224 0 3334 -11 12
-
 ### only semileptonic decays for beauty
 ### B0
 511:oneChannel = 1 0.0207000 0 12 -11 -411
diff --git a/MC/config/PWGEM/pythia8/decayer/force_semileptonic_charm.cfg b/MC/config/PWGEM/pythia8/decayer/force_semileptonic_charm.cfg
new file mode 100644
index 000000000..d605ab18d
--- /dev/null
+++ b/MC/config/PWGEM/pythia8/decayer/force_semileptonic_charm.cfg
@@ -0,0 +1,26 @@
+### only semileptonic decays for charm
+### D+
+411:oneChannel = 1 0.087 0 -311 -11 12
+411:addChannel = 1 0.040 0 -321 211 -11 12
+411:addChannel = 1 0.037 0 -313 -11 12
+### D0
+421:oneChannel = 1 0.035 0 -321 -11 12
+421:addChannel = 1 0.022 0 -323 -11 12
+421:addChannel = 1 0.016 0 -321 111 -11 12
+421:addChannel = 1 0.014 0 -311 -211 -11 12
+### Ds
+431:oneChannel = 1 0.025 0 333 -11 12
+431:addChannel = 1 0.027 0 221 -11 12
+### Lambdac
+4122:oneChannel = 1 0.036 0 3122 -11 12
+### chi_{c}^{+}
+4232:oneChannel = 1 0.07 0 3322 -11 12
+### chi_{c}^{0}
+4132:oneChannel = 1 0.014 0 3312 -11 12
+### Omega_{c}
+4332:oneChannel = 1 0.01224 0 3334 -11 12
+
+# Correct OmegaC decay length (wrong in PYTHIA8 decay table) (mm/c)
+4332:tau0 = 0.08000000000
+# Correct Lb decay length (wrong in PYTHIA8 decay table)
+5122:tau0 = 4.41000e-01
\ No newline at end of file