diff --git a/DATA/README.md b/DATA/README.md
index f6a10ef84..f3533ca26 100644
--- a/DATA/README.md
+++ b/DATA/README.md
@@ -227,7 +227,7 @@ export WORKFLOW_PARAMETERS=                                          # Additiona
 export RECO_NUM_NODES_OVERRIDE=0                                     # Override the number of EPN compute nodes to use (default is specified in description library file)
 export NHBPERTF=256                                                  # Number of HBF per TF
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
 [drohr@epn245 test]$ ./run.sh
 Loading ODC/0.36-1
   Loading requirement: BASE/1.0 GCC-Toolchain/v10.2.0-alice2-3 fmt/7.1.0-10 FairLogger/v1.9.1-7 zlib/v1.2.8-8 OpenSSL/v1.0.2o-9 libpng/v1.6.34-9 sqlite/v3.15.0-2 libffi/v3.2.1-2 FreeType/v2.10.1-8 Python/v3.6.10-12 Python-modules/1.0-16 boost/v1.75.0-13 ZeroMQ/v4.3.3-6 ofi/v1.7.1-8 asio/v1.19.1-2 asiofi/v0.5.1-2 DDS/3.5.16-5 FairMQ/v1.4.40-4
@@ -277,7 +277,7 @@ export WORKFLOW_PARAMETERS=EVENT_DISPLAY,CTF,GPU                     # Additiona
 export RECO_NUM_NODES_OVERRIDE=0                                     # Override the number of EPN compute nodes to use (default is specified in description library file)
 export NHBPERTF=256                                                  # Number of HBF per TF
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_output.xml
 [drohr@epn245 test]$ ./run.sh
 Loading ODC/0.36-1
   Loading requirement: BASE/1.0 GCC-Toolchain/v10.2.0-alice2-3 fmt/7.1.0-10 FairLogger/v1.9.1-7 zlib/v1.2.8-8 OpenSSL/v1.0.2o-9 libpng/v1.6.34-9 sqlite/v3.15.0-2 libffi/v3.2.1-2 FreeType/v2.10.1-8 Python/v3.6.10-12 Python-modules/1.0-16 boost/v1.75.0-13 ZeroMQ/v4.3.3-6 ofi/v1.7.1-8 asio/v1.19.1-2 asiofi/v0.5.1-2 DDS/3.5.16-5 FairMQ/v1.4.40-4
diff --git a/DATA/testing/detectors/FDD/run_fdd_ctf.sh b/DATA/testing/detectors/FDD/run_fdd_ctf.sh
index ebcd5dd8c..c413798e9 100755
--- a/DATA/testing/detectors/FDD/run_fdd_ctf.sh
+++ b/DATA/testing/detectors/FDD/run_fdd_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fdd-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FDD/run_fdd_digits_ctf.sh b/DATA/testing/detectors/FDD/run_fdd_digits_ctf.sh
index 4430d0f29..c8ac580d6 100755
--- a/DATA/testing/detectors/FDD/run_fdd_digits_ctf.sh
+++ b/DATA/testing/detectors/FDD/run_fdd_digits_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fdd-digits-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FDD/run_fdd_digits_qc_ctf.sh b/DATA/testing/detectors/FDD/run_fdd_digits_qc_ctf.sh
index d7c37ac7b..797cf88c6 100755
--- a/DATA/testing/detectors/FDD/run_fdd_digits_qc_ctf.sh
+++ b/DATA/testing/detectors/FDD/run_fdd_digits_qc_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fdd-digits-qc-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FT0/run_ft0_ctf.sh b/DATA/testing/detectors/FT0/run_ft0_ctf.sh
index 8f1878d1b..6cc1d8252 100755
--- a/DATA/testing/detectors/FT0/run_ft0_ctf.sh
+++ b/DATA/testing/detectors/FT0/run_ft0_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/ft0-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FT0/run_ft0_digits_ctf.sh b/DATA/testing/detectors/FT0/run_ft0_digits_ctf.sh
index caf0de573..7de20e592 100755
--- a/DATA/testing/detectors/FT0/run_ft0_digits_ctf.sh
+++ b/DATA/testing/detectors/FT0/run_ft0_digits_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/ft0-digits-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FT0/run_ft0_digits_qc_ctf.sh b/DATA/testing/detectors/FT0/run_ft0_digits_qc_ctf.sh
index 8528245f0..97ec8eadc 100755
--- a/DATA/testing/detectors/FT0/run_ft0_digits_qc_ctf.sh
+++ b/DATA/testing/detectors/FT0/run_ft0_digits_qc_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/ft0-digits-qc-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FV0/run_fv0_ctf.sh b/DATA/testing/detectors/FV0/run_fv0_ctf.sh
index a40f395f0..f8078d223 100755
--- a/DATA/testing/detectors/FV0/run_fv0_ctf.sh
+++ b/DATA/testing/detectors/FV0/run_fv0_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fv0-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FV0/run_fv0_digits_ctf.sh b/DATA/testing/detectors/FV0/run_fv0_digits_ctf.sh
index 213ec4828..307d0c682 100755
--- a/DATA/testing/detectors/FV0/run_fv0_digits_ctf.sh
+++ b/DATA/testing/detectors/FV0/run_fv0_digits_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fv0-digits-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/detectors/FV0/run_fv0_digits_qc_ctf.sh b/DATA/testing/detectors/FV0/run_fv0_digits_qc_ctf.sh
index e86d80f6a..e11a16fea 100755
--- a/DATA/testing/detectors/FV0/run_fv0_digits_qc_ctf.sh
+++ b/DATA/testing/detectors/FV0/run_fv0_digits_qc_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fv0-digits-qc-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/private/afurs/run_fdd_ft0_fv0_ctf.sh b/DATA/testing/private/afurs/run_fdd_ft0_fv0_ctf.sh
index 00f79f4e3..cef2b6338 100755
--- a/DATA/testing/private/afurs/run_fdd_ft0_fv0_ctf.sh
+++ b/DATA/testing/private/afurs/run_fdd_ft0_fv0_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fdd-ft0-fv0-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/private/afurs/run_fdd_ft0_fv0_digits_qc_ctf.sh b/DATA/testing/private/afurs/run_fdd_ft0_fv0_digits_qc_ctf.sh
index a86068b24..c3494c6cb 100755
--- a/DATA/testing/private/afurs/run_fdd_ft0_fv0_digits_qc_ctf.sh
+++ b/DATA/testing/private/afurs/run_fdd_ft0_fv0_digits_qc_ctf.sh
@@ -24,7 +24,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/fdd-ft0-fv0-digits-qc-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/private/afurs/run_ft0_fv0_ctf.sh b/DATA/testing/private/afurs/run_ft0_fv0_ctf.sh
index 50d7f6a4a..45b7e2678 100755
--- a/DATA/testing/private/afurs/run_ft0_fv0_ctf.sh
+++ b/DATA/testing/private/afurs/run_ft0_fv0_ctf.sh
@@ -25,7 +25,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/ft0-fv0-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/private/afurs/run_ft0_fv0_digits_qc_ctf.sh b/DATA/testing/private/afurs/run_ft0_fv0_digits_qc_ctf.sh
index 375ba8281..6ccc3315b 100755
--- a/DATA/testing/private/afurs/run_ft0_fv0_digits_qc_ctf.sh
+++ b/DATA/testing/private/afurs/run_ft0_fv0_digits_qc_ctf.sh
@@ -24,7 +24,7 @@ export MULTIPLICITY_FACTOR_REST=1                                    # Factor to
 
 export OUTPUT_FILE_NAME=$HOME/topologies/ft0-fv0-digits-qc-ctf.xml
 
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 if [ $? == 0 ]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
 fi
diff --git a/DATA/testing/private/shahoian/runTF_PB.sh b/DATA/testing/private/shahoian/runTF_PB.sh
index 5882ebce0..c841c7043 100755
--- a/DATA/testing/private/shahoian/runTF_PB.sh
+++ b/DATA/testing/private/shahoian/runTF_PB.sh
@@ -60,5 +60,5 @@ do
  export GEN_TOPO_WORKFLOW_NAME=$wf
  EXT="xml"   
  [ ! -z $WORKFLOWMODE ] && [ $WORKFLOWMODE == "print" ] && EXT="sh"
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/PB/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/PB/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
 done
diff --git a/DATA/testing/private/shahoian/runTF_ext_dpl.sh b/DATA/testing/private/shahoian/runTF_ext_dpl.sh
index d9e80b3fe..d4e91f89f 100755
--- a/DATA/testing/private/shahoian/runTF_ext_dpl.sh
+++ b/DATA/testing/private/shahoian/runTF_ext_dpl.sh
@@ -41,5 +41,5 @@ do
  export GEN_TOPO_WORKFLOW_NAME=$wf
  EXT="xml"   
  [ ! -z $WORKFLOWMODE ] && [ $WORKFLOWMODE == "print" ] && EXT="sh"
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
 done
diff --git a/DATA/testing/private/shahoian/run_PB.sh b/DATA/testing/private/shahoian/run_PB.sh
index f17c0637d..3b0dd807c 100755
--- a/DATA/testing/private/shahoian/run_PB.sh
+++ b/DATA/testing/private/shahoian/run_PB.sh
@@ -57,5 +57,5 @@ do
  export GEN_TOPO_WORKFLOW_NAME=$wf
  EXT="xml"   
  [ ! -z $WORKFLOWMODE ] && [ $WORKFLOWMODE == "print" ] && EXT="sh"
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/PB/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/PB/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
 done
diff --git a/DATA/testing/private/shahoian/run_ext.sh b/DATA/testing/private/shahoian/run_ext.sh
index ac5e4a566..0288e169c 100755
--- a/DATA/testing/private/shahoian/run_ext.sh
+++ b/DATA/testing/private/shahoian/run_ext.sh
@@ -33,5 +33,5 @@ jq -n 'reduce inputs as $s (input; .qc.tasks += ($s.qc.tasks) | .qc.checks += ($
 for wf in "$@"
 do
  export GEN_TOPO_WORKFLOW_NAME=$wf
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/test/${GEN_TOPO_WORKFLOW_NAME}.xml
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/test/${GEN_TOPO_WORKFLOW_NAME}.xml
 done
diff --git a/DATA/testing/private/shahoian/run_ext_dpl.sh b/DATA/testing/private/shahoian/run_ext_dpl.sh
index 039d36a46..348d54c7f 100755
--- a/DATA/testing/private/shahoian/run_ext_dpl.sh
+++ b/DATA/testing/private/shahoian/run_ext_dpl.sh
@@ -43,5 +43,5 @@ do
  export GEN_TOPO_WORKFLOW_NAME=$wf
  EXT="xml"
  [ ! -z $WORKFLOWMODE ] && [ $WORKFLOWMODE == "print" ] && EXT="sh"
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > "$HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.${EXT}"
 done
diff --git a/DATA/testing/private/shahoian/run_test.sh b/DATA/testing/private/shahoian/run_test.sh
index 21650c063..1c994f317 100755
--- a/DATA/testing/private/shahoian/run_test.sh
+++ b/DATA/testing/private/shahoian/run_test.sh
@@ -44,5 +44,5 @@ export WORKFLOWMODE=print
 for wf in "$@"
 do
  export GEN_TOPO_WORKFLOW_NAME=$wf
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/test/${GEN_TOPO_WORKFLOW_NAME}.xml
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/test/${GEN_TOPO_WORKFLOW_NAME}.xml
 done
diff --git a/DATA/testing/private/zampolli/calib/run.sh b/DATA/testing/private/zampolli/calib/run.sh
index e5f8b7ebb..bf4dc2a53 100755
--- a/DATA/testing/private/zampolli/calib/run.sh
+++ b/DATA/testing/private/zampolli/calib/run.sh
@@ -31,9 +31,9 @@ do
     echo Processing workflow $wf
     export GEN_TOPO_WORKFLOW_NAME=$wf
     export WORKFLOWMODE=dds
-    /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_calib/dplTest/${GEN_TOPO_WORKFLOW_NAME}.xml
+    /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_calib/dplTest/${GEN_TOPO_WORKFLOW_NAME}.xml
     # export WORKFLOWMODE=print
-    # /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_calib/dpl/${GEN_TOPO_WORKFLOW_NAME}.sh
+    # /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo_calib/dpl/${GEN_TOPO_WORKFLOW_NAME}.sh
 
 done
 
diff --git a/DATA/testing/private/zampolli/runTF_ext_dpl.sh b/DATA/testing/private/zampolli/runTF_ext_dpl.sh
index 5de8c7367..4f2279639 100755
--- a/DATA/testing/private/zampolli/runTF_ext_dpl.sh
+++ b/DATA/testing/private/zampolli/runTF_ext_dpl.sh
@@ -43,5 +43,5 @@ do
     echo
     echo Processing workflow $wf
     export GEN_TOPO_WORKFLOW_NAME=$wf
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.xml
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.xml
 done
diff --git a/DATA/testing/private/zampolli/run_ext_dpl.sh b/DATA/testing/private/zampolli/run_ext_dpl.sh
index 855fb2f1d..d7506480f 100755
--- a/DATA/testing/private/zampolli/run_ext_dpl.sh
+++ b/DATA/testing/private/zampolli/run_ext_dpl.sh
@@ -45,8 +45,8 @@ do
     echo Processing workflow $wf
     export GEN_TOPO_WORKFLOW_NAME=$wf
  export WORKFLOWMODE=dds
- /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/dplTest/${GEN_TOPO_WORKFLOW_NAME}.xml
+ /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/dplTest/${GEN_TOPO_WORKFLOW_NAME}.xml
 # export WORKFLOWMODE=print
-# /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.sh
+# /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $HOME/gen_topo/dpl/${GEN_TOPO_WORKFLOW_NAME}.sh
 
 done
diff --git a/DATA/tools/epn/gen_topo.sh b/DATA/tools/epn/gen_topo.sh
index b48c1de39..6c63bd4f8 100755
--- a/DATA/tools/epn/gen_topo.sh
+++ b/DATA/tools/epn/gen_topo.sh
@@ -4,7 +4,7 @@
 # Author: David Rohr
 
 # This script is developed within O2DPG: https://github.com/AliceO2Group/O2DPG/blob/master/DATA/tools/epn/gen_topo.sh
-# It is installed as package GenTopo to the updateable RPM path /opt/alisw/el8/GenTopo/bin/ on the EPNs
+# It is installed as package GenTopo to the updateable RPM path /opt/alisw/el9/GenTopo/bin/ on the EPNs
 
 # The purpose of this script is to separate the topology generation (which is in O2DPG) from the setting of the EPN-related settings
 # This script contains only the EPN related settings
@@ -59,7 +59,7 @@ else
   fi
 fi
 # Run stage 2 of GenTopo, which does the PDP part, still from hardcoded updatable RPM path
-/opt/alisw/el8/GenTopo/bin/gen_topo_o2dpg.sh
+/opt/alisw/el9/GenTopo/bin/gen_topo_o2dpg.sh
 if [ $? != 0 ]; then
   echo topology generation failed 1>&2
   exit 1
diff --git a/DATA/tools/epn/gen_topo_logged.sh b/DATA/tools/epn/gen_topo_logged.sh
index 9533712c7..c15d5f711 100755
--- a/DATA/tools/epn/gen_topo_logged.sh
+++ b/DATA/tools/epn/gen_topo_logged.sh
@@ -17,7 +17,7 @@ if [[ ! -z $GEN_TOPO_LOGDATE ]]; then
 fi
 
 STDERRFILE=$(mktemp)
-/opt/alisw/el8/GenTopo/bin/gen_topo.sh 2> $STDERRFILE
+/opt/alisw/el9/GenTopo/bin/gen_topo.sh 2> $STDERRFILE
 RETVAL=$?
 
 if [[ ! -z $GEN_TOPO_LOGDATE ]]; then
diff --git a/DATA/tools/epn/run.sh b/DATA/tools/epn/run.sh
index f16c074fe..cdd422c0a 100755
--- a/DATA/tools/epn/run.sh
+++ b/DATA/tools/epn/run.sh
@@ -35,8 +35,8 @@ if [[ "0$GEN_TOPO_RUN_HOME" == "01" ]]; then
   [[ -z $O2DPG_ROOT || -z $O2_ROOT ]] && { echo "ERROR: O2 and O2DPG must be in the environment!"; exit 1; }
   $O2DPG_ROOT/DATA/tools/epn/gen_topo.sh > $OUTPUT_FILE_NAME
 else
-  [[ ! -f /opt/alisw/el8/GenTopo/bin/gen_topo.sh ]] && { echo "ERROR: EPN installation of gen_topo.sh missing. Are you trying to run at home? Then please set GEN_TOPO_RUN_HOME=1!"; exit 1; }
-  /opt/alisw/el8/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
+  [[ ! -f /opt/alisw/el9/GenTopo/bin/gen_topo.sh ]] && { echo "ERROR: EPN installation of gen_topo.sh missing. Are you trying to run at home? Then please set GEN_TOPO_RUN_HOME=1!"; exit 1; }
+  /opt/alisw/el9/GenTopo/bin/gen_topo.sh > $OUTPUT_FILE_NAME
 fi
 if [[ $? == 0 ]]; then
   echo Generated XML topology $OUTPUT_FILE_NAME
diff --git a/DATA/tools/parse b/DATA/tools/parse
index e5b1d2d87..3152c0a08 100755
--- a/DATA/tools/parse
+++ b/DATA/tools/parse
@@ -60,9 +60,9 @@ else:
 
 modulecmd = " module purge ; "
 if 'GEN_TOPO_OVERRIDE_MODULE_DIR' in os.environ:
-    mod.module('unuse', '/opt/alisw/el8/modulefiles')
+    mod.module('unuse', '/opt/alisw/el9/modulefiles')
     mod.module('use', os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'])
-    modulecmd += ' module unuse /opt/alisw/el8/modulefiles 2>&1 ; module use ' + os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'] + ' 2>&1 ; '
+    modulecmd += ' module unuse /opt/alisw/el9/modulefiles 2>&1 ; module use ' + os.environ['GEN_TOPO_OVERRIDE_MODULE_DIR'] + ' 2>&1 ; '
 
 f = open(sys.argv[1], 'r')
 for line in f: