diff --git a/MC/config/ALICE3/pythia8/generator_pythia8_gun_PbPb.C b/MC/config/ALICE3/pythia8/generator_pythia8_gun_PbPb.C
index 9483dcada..4ebf92b9c 100755
--- a/MC/config/ALICE3/pythia8/generator_pythia8_gun_PbPb.C
+++ b/MC/config/ALICE3/pythia8/generator_pythia8_gun_PbPb.C
@@ -113,7 +113,7 @@ public:
     cout << "Initalizing extra PYTHIA object " << endl;
 
     // Read settings from external file.
-    std::string O2DPG_ROOT(getenv("O2DPG_ROOT"));
+    std::string O2DPG_ROOT(getenv("O2DPG_MC_CONFIG_ROOT"));
     std::string infile = O2DPG_ROOT + "/MC/config/ALICE3/pythia8/generator/pythia8_hi.cmnd";
     pythiaObject.readFile(infile);
 
diff --git a/MC/config/ALICE3/pythia8/generator_pythia8_gun_pp.C b/MC/config/ALICE3/pythia8/generator_pythia8_gun_pp.C
index 18b385447..f5292d32d 100755
--- a/MC/config/ALICE3/pythia8/generator_pythia8_gun_pp.C
+++ b/MC/config/ALICE3/pythia8/generator_pythia8_gun_pp.C
@@ -115,7 +115,7 @@ public:
     cout << "Initalizing extra PYTHIA object " << endl;
 
     // Read settings from external file.
-    std::string O2DPG_ROOT(getenv("O2DPG_ROOT"));
+    std::string O2DPG_ROOT(getenv("O2DPG_MC_CONFIG_ROOT"));
     std::string infile = O2DPG_ROOT + "/MC/config/ALICE3/pythia8/generator/pythia8_pp.cmnd";
     pythiaObject.readFile(infile);
 
diff --git a/MC/config/PWGDQ/EvtGen/GeneratorEvtGen.C b/MC/config/PWGDQ/EvtGen/GeneratorEvtGen.C
index 7c0f4650e..da0b1aa6a 100644
--- a/MC/config/PWGDQ/EvtGen/GeneratorEvtGen.C
+++ b/MC/config/PWGDQ/EvtGen/GeneratorEvtGen.C
@@ -264,7 +264,7 @@ class GeneratorEvtGen : public T
     // different decay table. case kAll read the default decay table only
     //
     DecayModeEvt decay = mDecayMode;
-    TString pathO2 = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
+    TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
     switch (decay) {
       case kEvtAll: // particles decayed "naturally" according to $ALICE_ROOT/TEvtGen/EvtGen/DECAY.DEC
         break;
diff --git a/MC/config/PWGDQ/external/generator/GeneratorBeautyToJpsi_EvtGen.C b/MC/config/PWGDQ/external/generator/GeneratorBeautyToJpsi_EvtGen.C
index bf8b1ea69..05801a67d 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorBeautyToJpsi_EvtGen.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorBeautyToJpsi_EvtGen.C
@@ -4,8 +4,8 @@
 // o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -15,7 +15,7 @@ FairGenerator*
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin, rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
@@ -53,7 +53,7 @@ FairGenerator*
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin, rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
diff --git a/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C b/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C
index 3edfb93dc..76c233ee4 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorBeautyToMu_EvtGen.C
@@ -4,8 +4,8 @@
 //o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini 
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -16,7 +16,7 @@ GeneratorBeautyToMu_EvtGenFwdY(double rapidityMin = -4.3, double rapidityMax = -
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin,rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
diff --git a/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsiAndJpsi_EvtGen.C b/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsiAndJpsi_EvtGen.C
index 98a4763c6..3cae508c6 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsiAndJpsi_EvtGen.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsiAndJpsi_EvtGen.C
@@ -4,8 +4,8 @@
 // o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_PsiAndJpsi_fwdy.ini
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -15,7 +15,7 @@ FairGenerator*
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin, rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
@@ -53,7 +53,7 @@ FairGenerator*
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin, rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
diff --git a/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsi_EvtGen.C b/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsi_EvtGen.C
index f68cd3525..1a0561af5 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsi_EvtGen.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorBeautyToPsi_EvtGen.C
@@ -4,8 +4,8 @@
 // o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_Psi2S_midy.ini
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -15,7 +15,7 @@ FairGenerator*
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin, rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
@@ -51,7 +51,7 @@ FairGenerator*
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin, rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
diff --git a/MC/config/PWGDQ/external/generator/GeneratorBottomonia.C b/MC/config/PWGDQ/external/generator/GeneratorBottomonia.C
index 25665ede2..2f9897cd2 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorBottomonia.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorBottomonia.C
@@ -2,7 +2,7 @@
 // generators for bottomonia considering at midrapidity and forward rapidity
 //
 
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorCocktail.C"
 #include "GeneratorEvtGen.C"
diff --git a/MC/config/PWGDQ/external/generator/GeneratorBplusToJpsiKaon_EvtGen.C b/MC/config/PWGDQ/external/generator/GeneratorBplusToJpsiKaon_EvtGen.C
index 01d389f55..9c6b125c1 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorBplusToJpsiKaon_EvtGen.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorBplusToJpsiKaon_EvtGen.C
@@ -1,8 +1,8 @@
 // o2-sim -j 1 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configKeyValues "GeneratorExternal.fileName=GeneratorBplusToJpsiKaon_EvtGen.C;GeneratorExternal.funcName=GeneratorBplusToJpsiKaon_EvtGen()" --configFile GeneratorHF_bbbarToBplus_midy.ini
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -12,7 +12,7 @@ FairGenerator*
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin, rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBplus.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBplus.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
@@ -29,7 +29,7 @@ FairGenerator*
     printf("PDG %d \n", std::stoi(spdg));
   }
 
-  TString pathO2 = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
+  TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
   gen->SetDecayTable(Form("%s/BPLUSTOKAONJPSITOELE.DEC", pathO2.Data()));
   // print debug
   // gen->PrintDebug();
diff --git a/MC/config/PWGDQ/external/generator/GeneratorCharmToMu_EvtGen.C b/MC/config/PWGDQ/external/generator/GeneratorCharmToMu_EvtGen.C
index 0f5f45d20..63c16bce9 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorCharmToMu_EvtGen.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorCharmToMu_EvtGen.C
@@ -4,8 +4,8 @@
 //o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini 
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -16,7 +16,7 @@ GeneratorCharmToMu_EvtGenFwdY(double rapidityMin = -4.3, double rapidityMax = -2
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin,rapidityMax);
   gen->setPDG(4);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV.C
index 341c72844..2bfcdd5a3 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV.C
@@ -2,8 +2,8 @@
 // o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV.C;GeneratorExternal.funcName=GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV()"
 //
 
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/PromptQuarkonia)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/PromptQuarkonia)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorCocktail.C"
 #include "GeneratorEvtGen.C"
diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_PbPb5TeV.C
index 1774ea2c4..cd7e5c000 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_PbPb5TeV.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_PbPb5TeV.C
@@ -1,8 +1,8 @@
 // usage
 // o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=GeneratorCocktailPromptCharmoniaToMuonEvtGen_PbPb5TeV.C;GeneratorExternal.funcName=GeneratorCocktailPromptCharmoniaToMuonEvtGen_PbPb5TeV()"
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/PromptQuarkonia)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/PromptQuarkonia)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorCocktail.C"
 #include "GeneratorEvtGen.C"
diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV.C
index 058e3ae36..237b9c475 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV.C
@@ -1,8 +1,8 @@
 // usage
 // o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV.C;GeneratorExternal.funcName=GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV()"
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/PromptQuarkonia)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/PromptQuarkonia)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorCocktail.C"
 #include "GeneratorEvtGen.C"
diff --git a/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C b/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C
index 2b3a98088..13d9ac545 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C
@@ -1,7 +1,7 @@
 // usage
 // o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C;GeneratorExternal.funcName=GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()"
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorEvtGen.C"
 
diff --git a/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV.C b/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV.C
index 363453493..abc9dd310 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV.C
@@ -1,7 +1,7 @@
 // usage
 // o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV.C;GeneratorExternal.funcName=GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV()"
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorEvtGen.C"
 
diff --git a/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C b/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C
index 61bbf2c26..c7a62623c 100644
--- a/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C
+++ b/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C
@@ -2,18 +2,18 @@
 // generators for prompt charmonia considering different cases (prompt jpsi, prompt psi2S, prompt jpsi+psi2S) at midrapidity and forward rapidity
 //
 // usage:
-// Jpsi+Psi2S midy: o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=$O2DPG_ROOT/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV()"
-// Jpsi midy:       o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=$O2DPG_ROOT/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()"
-// Psi2S midy:      o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=$O2DPG_ROOT/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptPSiToElectronEvtGen_pp13TeV()"
-// Jpsi+Psi2S fwdy: o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=$O2DPG_ROOT/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV()"
-// Jpsi fwdy:       o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=$O2DPG_ROOT/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV()"
-// Psi2S fwdy:      o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=$O2DPG_ROOT/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptPSiToMuonEvtGen_pp13TeV()"
-// ChiC1+ChiC2 midy:o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=$O2DPG_ROOT/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorCocktailChiCToElectronEvtGen_pp13TeV()"
+// Jpsi+Psi2S midy: o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorCocktailPromptCharmoniaToElectronEvtGen_pp13TeV()"
+// Jpsi midy:       o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()"
+// Psi2S midy:      o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptPSiToElectronEvtGen_pp13TeV()"
+// Jpsi+Psi2S fwdy: o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorCocktailPromptCharmoniaToMuonEvtGen_pp13TeV()"
+// Jpsi fwdy:       o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptJpsiToMuonEvtGen_pp13TeV()"
+// Psi2S fwdy:      o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorParamPromptPSiToMuonEvtGen_pp13TeV()"
+// ChiC1+ChiC2 midy:o2-sim -j 4 -n 10 -g external  -o sgn  --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorPromptCharmonia.C;GeneratorExternal.funcName=GeneratorCocktailChiCToElectronEvtGen_pp13TeV()"
 //
 
 //
 
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorCocktail.C"
 #include "GeneratorEvtGen.C"
@@ -825,7 +825,7 @@ FairGenerator*
     gen->AddPdg(std::stoi(spdg), i);
     printf("PDG %d \n", std::stoi(spdg));
   }
-  TString pathO2 = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
+  TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
   gen->SetDecayTable(Form("%s/PSITOJPSIPIPI.DEC", pathO2.Data()));
 
   // print debug
@@ -952,7 +952,7 @@ FairGenerator*
     gen->AddPdg(std::stoi(spdg), i);
     printf("PDG %d \n", std::stoi(spdg));
   }
-  TString pathO2 = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
+  TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
   gen->SetDecayTable(Form("%s/X3872TOJPSIPIPI.DEC", pathO2.Data()));
 
   // print debug
diff --git a/MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C b/MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C
index 8a9f5e7c0..8b97cf3b2 100644
--- a/MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C
+++ b/MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C
@@ -3,7 +3,7 @@
 #include "Pythia8/Pythia.h"
 #include "TRandom.h"
 
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
 #include "GeneratorEvtGen.C"
 
 #include <string>
@@ -25,7 +25,7 @@ public:
     mInverseTriggerRatio = inputTriggerRatio; 
     // define minimum bias event generator
     auto seed = (gRandom->TRandom::GetSeed() % 900000000);
-    TString pathconfigMB = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/generator/pythia8_inel_triggerGap.cfg");
+    TString pathconfigMB = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/generator/pythia8_inel_triggerGap.cfg");
     pythiaMBgen.readFile(pathconfigMB.Data());
     pythiaMBgen.readString("Random:setSeed on");
     pythiaMBgen.readString("Random:seed " + std::to_string(seed));
@@ -164,7 +164,7 @@ FairGenerator*
   gen->setPDG(5);
   gen->setRapidityHadron(-1.5,1.5);
   gen->setHadronMultiplicity(1);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
   gen->setConfigMBdecays(pathO2table);
   gen->setVerbose(verbose);
@@ -202,7 +202,7 @@ FairGenerator*
   gen->setPDG(5);
   gen->setRapidityHadron(rapidityMin,rapidityMax);
   gen->setHadronMultiplicity(1);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
   gen->setConfigMBdecays(pathO2table);
   gen->setVerbose(verbose);
@@ -241,7 +241,7 @@ FairGenerator*
   gen->addHadronPDGs(521);
   gen->setRapidityHadron(rapidityMin,rapidityMax);
   gen->setHadronMultiplicity(2);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBplus.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBplus.cfg");
   gen->readFile(pathO2table.Data());
   gen->setConfigMBdecays(pathO2table); 
   gen->setVerbose(verbose);
@@ -256,7 +256,7 @@ FairGenerator*
     printf("PDG %d \n", std::stoi(spdg));
   }
   
-  TString pathO2 = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
+  TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
   //gen->SetDecayTable(Form("%s/BPLUSTOKAONJPSITOELE.DEC", pathO2.Data()));
   gen->SetDecayTable(Form("%s/BPLUSTOKAONJPSITOELEALLMODES.DEC", pathO2.Data())); // decay table including decay modes for correlated background
   // print debug
@@ -281,7 +281,7 @@ FairGenerator*
   gen->setPDG(5);
   gen->setRapidityHadron(rapidityMin,rapidityMax);
   gen->setHadronMultiplicity(1);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
   gen->setConfigMBdecays(pathO2table);
   gen->setVerbose(verbose);
@@ -320,7 +320,7 @@ FairGenerator*
   gen->setPDG(5);
   gen->setRapidityHadron(rapidityMin,rapidityMax);
   gen->setHadronMultiplicity(1);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffBhadrons.cfg");
   gen->readFile(pathO2table.Data());
   gen->setConfigMBdecays(pathO2table);
   gen->setVerbose(verbose);
diff --git a/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C b/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
index 44035a834..f7b406849 100644
--- a/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
+++ b/MC/config/PWGDQ/trigger/selectDaughterFromHFwithinAcc.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT)
 #include <TParticle.h>
 #include "Generators/Trigger.h"
 
diff --git a/MC/config/PWGEM/external/generator/GeneratorBeautyToEle_EvtGen.C b/MC/config/PWGEM/external/generator/GeneratorBeautyToEle_EvtGen.C
index b33e44cf1..4973b24ae 100644
--- a/MC/config/PWGEM/external/generator/GeneratorBeautyToEle_EvtGen.C
+++ b/MC/config/PWGEM/external/generator/GeneratorBeautyToEle_EvtGen.C
@@ -4,8 +4,8 @@
 //o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini 
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -16,7 +16,7 @@ GeneratorBeautyToEle_EvtGen(double rapidityMin = -2., double rapidityMax = 2., b
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin,rapidityMax);
   gen->setPDG(5);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffCBhadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffCBhadrons.cfg");
   gen->readFile(pathO2table.Data());
 
 
diff --git a/MC/config/PWGEM/external/generator/GeneratorCharmToEle_EvtGen.C b/MC/config/PWGEM/external/generator/GeneratorCharmToEle_EvtGen.C
index 60082d27c..71210eca7 100644
--- a/MC/config/PWGEM/external/generator/GeneratorCharmToEle_EvtGen.C
+++ b/MC/config/PWGEM/external/generator/GeneratorCharmToEle_EvtGen.C
@@ -4,8 +4,8 @@
 //o2-sim -j 4 -n 10 -g external -t external -m "PIPE ITS TPC" -o sgn --configFile GeneratorHF_bbbar_midy.ini 
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGHF/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGHF/external/generator)
 #include "GeneratorEvtGen.C"
 #include "GeneratorHF.C"
 
@@ -16,7 +16,7 @@ GeneratorCharmToEle_EvtGen(double rapidityMin = -2., double rapidityMax = 2., bo
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorHF>();
   gen->setRapidity(rapidityMin,rapidityMax);
   gen->setPDG(4);
-  TString pathO2table = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
+  TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
   gen->readFile(pathO2table.Data());
 
   gen->setVerbose(verbose);
diff --git a/MC/config/PWGEM/external/generator/GeneratorCocktailLF.C b/MC/config/PWGEM/external/generator/GeneratorCocktailLF.C
index becd04ab3..7f35f49d8 100644
--- a/MC/config/PWGEM/external/generator/GeneratorCocktailLF.C
+++ b/MC/config/PWGEM/external/generator/GeneratorCocktailLF.C
@@ -2,8 +2,8 @@
 //
 //
 
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/external/generator)
 #include "GeneratorCocktail.C"
 #include "GeneratorEvtGen.C"
 
@@ -88,12 +88,12 @@ GeneratorCocktailLF(int nPart, bool ispp)
   auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
 
   // EXODUS decayer
-  TString O2DPG_ROOT = TString(getenv("O2DPG_ROOT"));
+  TString O2DPG_ROOT = TString(getenv("O2DPG_MC_CONFIG_ROOT"));
   auto decayer = new PythiaDecayerConfig();
   decayer->SetDecayerExodus();
-  TString useLMeeDecaytable = "$O2DPG_ROOT/MC/config/PWGEM/decaytables/decaytable_LMee.dat";
-  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_ROOT",O2DPG_ROOT);
-  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_ROOT}",O2DPG_ROOT);
+  TString useLMeeDecaytable = "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/decaytables/decaytable_LMee.dat";
+  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_MC_CONFIG_ROOT",O2DPG_ROOT);
+  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_MC_CONFIG_ROOT}",O2DPG_ROOT);
   decayer->SetDecayTableFile(useLMeeDecaytable.Data());
   decayer->ReadDecayTable();
 
diff --git a/MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C b/MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C
index 0511ecaf7..44195ebd2 100644
--- a/MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C
+++ b/MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/external/generator)
 R__LOAD_LIBRARY(libpythia6)
 #include "GeneratorCocktail.C"
 
@@ -435,11 +435,11 @@ GenerateEMCocktail(Int_t collisionsSystem = GeneratorParamEMlibV2::kpp7TeV,
                    Double_t yGenRange = 0.1, TString useLMeeDecaytable = "",
                    Int_t weightingMode = 1) {
 
-  TString O2DPG_MC_CONFIG_ROOT = TString(getenv("O2DPG_MC_CONFIG_ROOT"));
-  paramFile=paramFile.ReplaceAll("$O2DPG_MC_CONFIG_ROOT",O2DPG_MC_CONFIG_ROOT);
-  paramFile=paramFile.ReplaceAll("${O2DPG_MC_CONFIG_ROOT}",O2DPG_MC_CONFIG_ROOT);
-  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_MC_CONFIG_ROOT",O2DPG_MC_CONFIG_ROOT);
-  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_MC_CONFIG_ROOT}",O2DPG_MC_CONFIG_ROOT);
+  TString O2DPG_ROOT = TString(getenv("O2DPG_MC_CONFIG_ROOT"));
+  paramFile=paramFile.ReplaceAll("$O2DPG_MC_CONFIG_ROOT",O2DPG_ROOT);
+  paramFile=paramFile.ReplaceAll("${O2DPG_MC_CONFIG_ROOT}",O2DPG_ROOT);
+  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_MC_CONFIG_ROOT",O2DPG_ROOT);
+  useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_MC_CONFIG_ROOT}",O2DPG_ROOT);
   if (paramFile.BeginsWith("alien://")){
     TGrid::Connect("alien://");
   }
diff --git a/MC/config/PWGEM/external/generator/GeneratorHFToEleFull_EvtGen.C b/MC/config/PWGEM/external/generator/GeneratorHFToEleFull_EvtGen.C
index 0cebace65..9862591b0 100644
--- a/MC/config/PWGEM/external/generator/GeneratorHFToEleFull_EvtGen.C
+++ b/MC/config/PWGEM/external/generator/GeneratorHFToEleFull_EvtGen.C
@@ -1,6 +1,6 @@
 //
 //
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
 #include "GeneratorEvtGen.C"
 
 
@@ -17,9 +17,9 @@ GeneratorHFToEleFull_EvtGen(bool forcedecay = true, bool allHF = true)
   auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorPythia8>();
   TString pathO2table;
   if (allHF) {
-     pathO2table  = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffCBhadrons.cfg");
+     pathO2table  = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffCBhadrons.cfg");
   } else {
-     pathO2table  = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
+     pathO2table  = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffChadrons.cfg");
   }
   gen->readFile(pathO2table.Data());
 
diff --git a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_HFLepton.C b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_HFLepton.C
index d967798b8..76e00b406 100644
--- a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_HFLepton.C
+++ b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_HFLepton.C
@@ -34,7 +34,7 @@ public:
     lGeneratedEvents += offset;
     
     cout << "Initalizing extra PYTHIA object used to generate min-bias events..." << endl;
-    TString pathconfigMB = gSystem->ExpandPathName("$O2DPG_ROOT/MC/config/PWGEM/pythia8/generator/pythia8_MB_gapevent.cfg");
+    TString pathconfigMB = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/pythia8_MB_gapevent.cfg");
     pythiaObjectMinimumBias.readFile(pathconfigMB.Data());
     pythiaObjectMinimumBias.readString("Random:setSeed on");
     pythiaObjectMinimumBias.readString("Random:seed " + std::to_string(seed));
@@ -187,7 +187,7 @@ private:
 // Charm-enriched forced decay
 FairGenerator* GeneratorPythia8GapTriggeredCharmLepton(int inputTriggerRatio, int inputExternalID, float yMin = -1.5, float yMax = 1.5)
 {
-  auto myGen = new GeneratorPythia8GapTriggeredHFLepton("$O2DPG_ROOT/MC/config/PWGEM/pythia8/generator/pythia8_pp_cr2_forceddecayscharm.cfg", 4, inputTriggerRatio, inputExternalID);
+  auto myGen = new GeneratorPythia8GapTriggeredHFLepton("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/pythia8_pp_cr2_forceddecayscharm.cfg", 4, inputTriggerRatio, inputExternalID);
   auto seed = (gRandom->TRandom::GetSeed() % 900000000);
   myGen->readString("Random:setSeed on");
   myGen->readString("Random:seed " + std::to_string(seed));
@@ -200,7 +200,7 @@ FairGenerator* GeneratorPythia8GapTriggeredCharmLepton(int inputTriggerRatio, in
 // Beauty-enriched forced decay
 FairGenerator* GeneratorPythia8GapTriggeredBeautyForcedDecays(int inputTriggerRatio, int inputExternalID, float yMin = -1.5, float yMax = 1.5)
 {
-  auto myGen = new GeneratorPythia8GapTriggeredHFLepton("$O2DPG_ROOT/MC/config/PWGEM/pythia8/generator/pythia8_bbbar_forceddecayscharmbeauty.cfg", 5, inputTriggerRatio, inputExternalID);
+  auto myGen = new GeneratorPythia8GapTriggeredHFLepton("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/pythia8_bbbar_forceddecayscharmbeauty.cfg", 5, inputTriggerRatio, inputExternalID);
   auto seed = (gRandom->TRandom::GetSeed() % 900000000);
   myGen->readString("Random:setSeed on");
   myGen->readString("Random:seed " + std::to_string(seed));
@@ -213,7 +213,7 @@ FairGenerator* GeneratorPythia8GapTriggeredBeautyForcedDecays(int inputTriggerRa
 // Beauty-enriched no forced decay
 FairGenerator* GeneratorPythia8GapTriggeredBeautyNoForcedDecays(int inputTriggerRatio, int inputExternalID, float yMin = -1.5, float yMax = 1.5)
 {
-  auto myGen = new GeneratorPythia8GapTriggeredHFLepton("$O2DPG_ROOT/MC/config/PWGEM/pythia8/generator/pythia8_bbbar.cfg", 5, inputTriggerRatio, inputExternalID);
+  auto myGen = new GeneratorPythia8GapTriggeredHFLepton("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/pythia8/generator/pythia8_bbbar.cfg", 5, inputTriggerRatio, inputExternalID);
   auto seed = (gRandom->TRandom::GetSeed() % 900000000);
   myGen->readString("Random:setSeed on");
   myGen->readString("Random:seed " + std::to_string(seed));
diff --git a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFee.C b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFee.C
index ecf5f5de9..34b4f9840 100644
--- a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFee.C
+++ b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFee.C
@@ -1,6 +1,6 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/external/generator)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGEM/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGEM/external/generator)
 R__LOAD_LIBRARY(libpythia6)
 R__LOAD_LIBRARY(libEGPythia6)
 #include "GeneratorEvtGen.C"
@@ -161,12 +161,12 @@ class GeneratorPythia8GapTriggeredLFee : public GeneratorPythia8 {
       fGeneratorCocktail = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
 
       // EXODUS decayer
-      TString O2DPG_ROOT = TString(getenv("O2DPG_ROOT"));
+      TString O2DPG_ROOT = TString(getenv("O2DPG_MC_CONFIG_ROOT"));
       auto decayer = new PythiaDecayerConfig();
       decayer->SetDecayerExodus();
-      TString useLMeeDecaytable = "$O2DPG_ROOT/MC/config/PWGEM/decaytables/decaytable_LMee.dat";
-      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_ROOT",O2DPG_ROOT);
-      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_ROOT}",O2DPG_ROOT);
+      TString useLMeeDecaytable = "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/decaytables/decaytable_LMee.dat";
+      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_MC_CONFIG_ROOT",O2DPG_ROOT);
+      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_MC_CONFIG_ROOT}",O2DPG_ROOT);
       decayer->SetDecayTableFile(useLMeeDecaytable.Data());
       decayer->ReadDecayTable();
 
diff --git a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFgamma.C b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFgamma.C
index 7287009b3..d4c940e2e 100644
--- a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFgamma.C
+++ b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFgamma.C
@@ -1,6 +1,6 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/external/generator)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGEM/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGEM/external/generator)
 R__LOAD_LIBRARY(libpythia6)
 R__LOAD_LIBRARY(libEGPythia6)
 #include "GeneratorEvtGen.C"
diff --git a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFmumu.C b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFmumu.C
index a2417eae3..feb9ea86e 100644
--- a/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFmumu.C
+++ b/MC/config/PWGEM/external/generator/Generator_pythia8_GapTriggered_LFmumu.C
@@ -1,6 +1,6 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/external/generator)
-R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGEM/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/external/generator)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGEM/external/generator)
 R__LOAD_LIBRARY(libpythia6)
 R__LOAD_LIBRARY(libEGPythia6)
 #include "GeneratorEvtGen.C"
@@ -55,12 +55,12 @@ class GeneratorPythia8GapTriggeredLFmumu : public GeneratorPythia8 {
       fGeneratorCocktail = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
 
       // EXODUS decayer
-      TString O2DPG_ROOT = TString(getenv("O2DPG_ROOT"));
+      TString O2DPG_ROOT = TString(getenv("O2DPG_MC_CONFIG_ROOT"));
       auto decayer = new PythiaDecayerConfig();
       decayer->SetDecayerExodus();
-      TString useLMeeDecaytable = "$O2DPG_ROOT/MC/config/PWGEM/decaytables/decaytable_LMee.dat";
-      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_ROOT",O2DPG_ROOT);
-      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_ROOT}",O2DPG_ROOT);
+      TString useLMeeDecaytable = "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/decaytables/decaytable_LMee.dat";
+      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("$O2DPG_MC_CONFIG_ROOT",O2DPG_ROOT);
+      useLMeeDecaytable=useLMeeDecaytable.ReplaceAll("${O2DPG_MC_CONFIG_ROOT}",O2DPG_ROOT);
       decayer->SetDecayTableFile(useLMeeDecaytable.Data());
       decayer->ReadDecayTable();
 
diff --git a/MC/config/PWGGAJE/hooks/jets_hook.C b/MC/config/PWGGAJE/hooks/jets_hook.C
index 5191160b7..02ccb4dd9 100644
--- a/MC/config/PWGGAJE/hooks/jets_hook.C
+++ b/MC/config/PWGGAJE/hooks/jets_hook.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT)
 #include "MC/run/common/detector_acceptance.C"
 #include "Pythia8/Pythia.h"
 
diff --git a/MC/config/PWGGAJE/hooks/prompt_gamma_hook.C b/MC/config/PWGGAJE/hooks/prompt_gamma_hook.C
index ec8d7e900..678b67c18 100644
--- a/MC/config/PWGGAJE/hooks/prompt_gamma_hook.C
+++ b/MC/config/PWGGAJE/hooks/prompt_gamma_hook.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT)
 #include "MC/run/common/detector_acceptance.C"
 #include "Pythia8/Pythia.h"
 
diff --git a/MC/config/PWGGAJE/trigger/decay_gamma_jets.C b/MC/config/PWGGAJE/trigger/decay_gamma_jets.C
index 791544241..2225c5dde 100644
--- a/MC/config/PWGGAJE/trigger/decay_gamma_jets.C
+++ b/MC/config/PWGGAJE/trigger/decay_gamma_jets.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT)
 #include "MC/run/common/detector_acceptance.C"
 #include <TParticle.h>
 #include "Generators/Trigger.h"
diff --git a/MC/config/PWGGAJE/trigger/prompt_gamma.C b/MC/config/PWGGAJE/trigger/prompt_gamma.C
index b6b51e3d3..3c019c809 100644
--- a/MC/config/PWGGAJE/trigger/prompt_gamma.C
+++ b/MC/config/PWGGAJE/trigger/prompt_gamma.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT)
 #include "MC/run/common/detector_acceptance.C"
 #include <TParticle.h>
 #include "Generators/Trigger.h"
diff --git a/MC/config/PWGHF/trigger/trigger_ccbar.C b/MC/config/PWGHF/trigger/trigger_ccbar.C
index 5ef9b52e5..4c71702e4 100644
--- a/MC/config/PWGHF/trigger/trigger_ccbar.C
+++ b/MC/config/PWGHF/trigger/trigger_ccbar.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT)
 #include "Generators/Trigger.h"
 #include "TParticle.h"
 #include "TParticlePDG.h"
diff --git a/MC/config/PWGLF/ini/tests/GeneratorLFStrangeness.C b/MC/config/PWGLF/ini/tests/GeneratorLFStrangeness.C
index 842ba854a..ca670a64e 100644
--- a/MC/config/PWGLF/ini/tests/GeneratorLFStrangeness.C
+++ b/MC/config/PWGLF/ini/tests/GeneratorLFStrangeness.C
@@ -4,7 +4,7 @@ int External()
   // std::string path{"bkg_Kine.root"};
   std::vector<int> numberOfInjectedSignalsPerEvent = {};
   std::vector<int> injectedPDGs = {};
-  std::string particleList = "${O2DPG_ROOT}/MC/config/PWGLF/pythia8/generator/strangeparticlelist.gun";
+  std::string particleList = "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/generator/strangeparticlelist.gun";
   particleList = gSystem->ExpandPathName(particleList.c_str());
 
   std::ifstream inputFile(particleList.c_str(), ios::in);
diff --git a/MC/config/PWGLF/pythia8/generator_pythia8_LF.C b/MC/config/PWGLF/pythia8/generator_pythia8_LF.C
index 7f17f20b1..9b1d0f459 100644
--- a/MC/config/PWGLF/pythia8/generator_pythia8_LF.C
+++ b/MC/config/PWGLF/pythia8/generator_pythia8_LF.C
@@ -11,7 +11,7 @@
 ///               `o2-sim -g external --configKeyValues 'GeneratorExternal.fileName=generator_pythia8_LF.C;GeneratorExternal.funcName=generateLF({{1000010020, 10, 0.5, 10}, {1000010030, 10, 0.5, 10}})'`
 ///               Here PDG, Number injected, pT limits are separated are divided per particle
 ///         or:
-///               `o2-sim -g external --configKeyValues 'GeneratorExternal.fileName=generator_pythia8_LF.C;GeneratorExternal.funcName=generateLF("${O2DPG_ROOT}/MC/config/PWGLF/pythia8/generator/nuclei.gun")'`
+///               `o2-sim -g external --configKeyValues 'GeneratorExternal.fileName=generator_pythia8_LF.C;GeneratorExternal.funcName=generateLF("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/generator/nuclei.gun")'`
 ///               Here PDG, Number injected, pT limits are provided via an intermediate configuration file
 ///
 
@@ -37,8 +37,8 @@ class GeneratorPythia8LF : public o2::eventgen::GeneratorPythia8
   GeneratorPythia8LF(bool injOnePerEvent /*= true*/,
                      int gapBetweenInjection /*= 0*/,
                      bool useTrigger /*= false*/,
-                     std::string pythiaCfgMb /*= "${O2DPG_ROOT}/MC/config/PWGLF/pythia8/pythia8_inel_minbias.cfg"*/,
-                     std::string pythiaCfgSignal /*= "${O2DPG_ROOT}/MC/config/PWGLF/pythia8/pythia8_inel_signal.cfg"*/) : GeneratorPythia8{},
+                     std::string pythiaCfgMb /*= "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/pythia8_inel_minbias.cfg"*/,
+                     std::string pythiaCfgSignal /*= "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/pythia8_inel_signal.cfg"*/) : GeneratorPythia8{},
                                                                                                                           mOneInjectionPerEvent{injOnePerEvent},
                                                                                                                           mGapBetweenInjection{gapBetweenInjection},
                                                                                                                           mUseTriggering{useTrigger}
@@ -492,7 +492,7 @@ FairGenerator* generateLF(std::vector<GeneratorPythia8LF::ConfigContainer> cfg,
 
 ///___________________________________________________________
 /// Create generator via input file
-FairGenerator* generateLF(std::string configuration = "${O2DPG_ROOT}/MC/config/PWGLF/pythia8/generator/nuclei.gun",
+FairGenerator* generateLF(std::string configuration = "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/generator/nuclei.gun",
                           bool injectOnePDGPerEvent = true,
                           int gapBetweenInjection = 0,
                           bool useTrigger = false,
@@ -546,7 +546,7 @@ FairGenerator* generateLF(std::string configuration = "${O2DPG_ROOT}/MC/config/P
 
 ///___________________________________________________________
 /// Create generator via input file for the triggered mode
-FairGenerator* generateLFTriggered(std::string configuration = "${O2DPG_ROOT}/MC/config/PWGLF/pythia8/generator/nuclei.gun",
+FairGenerator* generateLFTriggered(std::string configuration = "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/generator/nuclei.gun",
                                    int gapBetweenInjection = 0,
                                    std::string pythiaCfgMb = "",
                                    std::string pythiaCfgSignal = "")
diff --git a/MC/config/PWGUD/ini/makeUpcgenConfig.py b/MC/config/PWGUD/ini/makeUpcgenConfig.py
index cea1854d0..9915b2f35 100755
--- a/MC/config/PWGUD/ini/makeUpcgenConfig.py
+++ b/MC/config/PWGUD/ini/makeUpcgenConfig.py
@@ -40,12 +40,12 @@
 
 ### Generator
 fout.write('[GeneratorExternal] \n')
-fout.write('fileName = ${O2DPG_ROOT}/MC/config/PWGUD/external/generator/GeneratorUpcgen.C \n')
+fout.write('fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGUD/external/generator/GeneratorUpcgen.C \n')
 fout.write('funcName = GeneratorUpcgen("%s", "%s", %f, %d, %d)  \n' % (args.process,"../.",args.eCM,pZ,pA))
     
 ###Trigger
 fout.write('[TriggerExternal] \n')
-fout.write('fileName = ${O2DPG_ROOT}/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C \n')
+fout.write('fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C \n')
 if args.rapidity == 'cent_rap':
     fout.write('funcName = selectMotherPartInAcc(-0.9,0.9) \n')
 if args.rapidity == 'muon_rap':
diff --git a/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C b/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C
index 513a93c13..12fac6743 100644
--- a/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C
+++ b/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C
@@ -1,4 +1,4 @@
-R__ADD_INCLUDE_PATH($O2DPG_ROOT)
+R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT)
 #include <TParticle.h>
 #include "Generators/Trigger.h"
 
diff --git a/MC/config/examples/external/generator/SimpleCocktail.C b/MC/config/examples/external/generator/SimpleCocktail.C
index 6eed39aee..e8ce666e2 100644
--- a/MC/config/examples/external/generator/SimpleCocktail.C
+++ b/MC/config/examples/external/generator/SimpleCocktail.C
@@ -3,7 +3,7 @@
 // to construct any meta-generator (such as cocktails) consisting
 // or using a pool of underlying o2::eventgen::Generators.
 
-// Test is using #o2-sim-dpl-eventgen --nEvents 10 --generator external --configKeyValues "GeneratorExternal.fileName=${O2DPG_ROOT}/MC/config/examples/external/generator/SimpleCocktail.C;GeneratorExternal.funcName=getSimpleGap()"
+// Test is using #o2-sim-dpl-eventgen --nEvents 10 --generator external --configKeyValues "GeneratorExternal.fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/examples/external/generator/SimpleCocktail.C;GeneratorExternal.funcName=getSimpleGap()"
 
 namespace o2
 {