diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21c.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21c.C
index fb4919b5e53d558641cd28a85a85ee181f26eefc..2319bce46cf04f7e060d1f700585a4dc17e38a77 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21c.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21c.C
@@ -597,6 +597,8 @@ void dump_digi_file();
 
 void Create_TRD_Geometry_v21c()
 {
+  // Load FairRunSim to ensure the correct unit system
+  FairRunSim* sim = new FairRunSim();
 
   // declare TRD layer layout
   if (setupid > 2)
@@ -676,6 +678,13 @@ void Create_TRD_Geometry_v21c()
   gGeoMan->Write();  // use this is you want GeoManager format in the output
   outfile->Close();
 
+  // create medialist for this geometry
+  TString createmedialist = gSystem->Getenv("VMCWORKDIR");
+  createmedialist += "/macro/geometry/create_medialist.C";
+  std::cout << "Loading macro " << createmedialist << std::endl;
+  gROOT->LoadMacro(createmedialist);
+  gROOT->ProcessLine("create_medialist(\"\", false)");
+
   dump_info_file();
   dump_digi_file();
 
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21d.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21d.C
index cd7853b3e686066588947499045b5e5255b7a233..e20568a04e88fb7f8c52b21fc7128dd96642e013 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21d.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21d.C
@@ -598,6 +598,8 @@ void dump_digi_file();
 
 void Create_TRD_Geometry_v21d()
 {
+  // Load FairRunSim to ensure the correct unit system
+  FairRunSim* sim = new FairRunSim();
 
   // declare TRD layer layout
   if (setupid > 2)
@@ -677,6 +679,13 @@ void Create_TRD_Geometry_v21d()
   gGeoMan->Write();  // use this is you want GeoManager format in the output
   outfile->Close();
 
+  // create medialist for this geometry
+  TString createmedialist = gSystem->Getenv("VMCWORKDIR");
+  createmedialist += "/macro/geometry/create_medialist.C";
+  std::cout << "Loading macro " << createmedialist << std::endl;
+  gROOT->LoadMacro(createmedialist);
+  gROOT->ProcessLine("create_medialist(\"\", false)");
+
   dump_info_file();
   dump_digi_file();