diff --git a/benchmarks/clustering/full_cal_clusters.sh b/benchmarks/clustering/full_cal_clusters.sh
index f4dce6fc9a4c6679e0a082724a0214dcd142ac90..5f135014a5967869ed44e72b9110a5967bf813fe 100644
--- a/benchmarks/clustering/full_cal_clusters.sh
+++ b/benchmarks/clustering/full_cal_clusters.sh
@@ -71,11 +71,11 @@ if [[ ! -n  "${FULL_CAL_PMAX}" ]] ; then
   export FULL_CAL_PMIN=10.0
 fi
 
-if [[ ! -n "${JUGGLER_DETECTOR_PATH}" ]] ; then
-  export JUGGLER_DETECTOR_PATH=${DETECTOR_PATH}
+if [[ ! -n "${DETECTOR_PATH}" ]] ; then
+  export DETECTOR_PATH=${DETECTOR_PATH}
 fi
 
-compact_path=${JUGGLER_DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
 export JUGGLER_FILE_NAME_TAG="${nametag}"
 export JUGGLER_GEN_FILE="gen_${JUGGLER_FILE_NAME_TAG}.hepmc"
 
@@ -84,7 +84,7 @@ export JUGGLER_DIGI_FILE="digi_${JUGGLER_FILE_NAME_TAG}.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR_PATH = ${JUGGLER_DETECTOR_PATH}"
+echo "DETECTOR_PATH = ${DETECTOR_PATH}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index 3e63bf563e676cd2354f6030c4a29436c6a22818..6e1d3691153bbf191f0831fe1d2cb1ed38fda639 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = os.path.join(detector_path, detector_name)
 
 # get sampling fractions from system environment variable, 1.0 by default
diff --git a/benchmarks/clustering/options/full_trackpluscalo_reco.py b/benchmarks/clustering/options/full_trackpluscalo_reco.py
index 0d742ab42e0e6bcbd369041420363d3db15c0302..fc016724751e5fed0585158a3aee5c3b384c7987 100644
--- a/benchmarks/clustering/options/full_trackpluscalo_reco.py
+++ b/benchmarks/clustering/options/full_trackpluscalo_reco.py
@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = os.path.join(detector_path, detector_name)
 
 # get sampling fractions from system environment variable, 1.0 by default
diff --git a/benchmarks/ecal/options/barrel.py b/benchmarks/ecal/options/barrel.py
index f44bf58fca4c4e76ce84125f76d0b10269b3e6de..c71d5775446d4249e4a52179860a9bf1f5b65af6 100644
--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 
 # input and output
diff --git a/benchmarks/ecal/options/endcap_e.py b/benchmarks/ecal/options/endcap_e.py
index b70f0d8003b3232efa207d3102047a872923f539..609c83da01c831b8ad724205f2e7a680b203865e 100644
--- a/benchmarks/ecal/options/endcap_e.py
+++ b/benchmarks/ecal/options/endcap_e.py
@@ -10,7 +10,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 
 # input and output
diff --git a/benchmarks/ecal/options/endcap_i.py b/benchmarks/ecal/options/endcap_i.py
index 7e5553b609cd27cc1c00ba20c31501fbff9fc87c..e03f8ad904faba5e563d7f817e3e2ecaad954403 100644
--- a/benchmarks/ecal/options/endcap_i.py
+++ b/benchmarks/ecal/options/endcap_i.py
@@ -11,7 +11,7 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, G
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
 detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_path = str(os.environ.get("JUGGLER_DETECTOR_PATH", "."))
+detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 ci_ecal_sf = float(os.environ.get("CI_ECAL_SAMP_FRAC", 0.253))
 
diff --git a/benchmarks/ecal/run_emcal_benchmarks.py b/benchmarks/ecal/run_emcal_benchmarks.py
index 3526ca58d719a7a0a3d1267d266216b64ee18cbb..f3ecf610cb4e26476fddb5de721bf97e12f2debe 100755
--- a/benchmarks/ecal/run_emcal_benchmarks.py
+++ b/benchmarks/ecal/run_emcal_benchmarks.py
@@ -31,7 +31,7 @@ default_type = {
 #         ['EcalEndcapNClusters', 'EcalEndcapPClusters', 'EcalBarrelClusters']],
 }
 
-default_compact = os.path.join(os.environ.get('JUGGLER_DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
+default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
         '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('run_type', help='Run type, support {}'.format(list(default_type.keys())))
diff --git a/benchmarks/full/full_reconstruction.sh b/benchmarks/full/full_reconstruction.sh
index f8482b088edf8bb22049639c95046f52991029d1..6feabb149ab9de904afe44fe34cc41e1e7c84f29 100644
--- a/benchmarks/full/full_reconstruction.sh
+++ b/benchmarks/full/full_reconstruction.sh
@@ -110,15 +110,11 @@ if [[ ! -n "${JUGGLER_DETECTOR}" ]] ; then
   export JUGGLER_DETECTOR="athena"
 fi
 
-if [[ ! -n "${JUGGLER_DETECTOR_PATH}" ]] ; then
-  export JUGGLER_DETECTOR_PATH="/opt/detector/share/athena"
-fi
-
 if [[ ! -n "${JUGGLER_INSTALL_PREFIX}" ]] ; then
   export JUGGLER_INSTALL_PREFIX="/usr/local"
 fi
 
-compact_path=${JUGGLER_DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
 export JUGGLER_FILE_NAME_TAG="${nametag}"
 export JUGGLER_GEN_FILE="gen_${JUGGLER_FILE_NAME_TAG}.hepmc"
 
@@ -126,7 +122,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR_PATH = ${JUGGLER_DETECTOR_PATH}"
+echo "DETECTOR_PATH = ${DETECTOR_PATH}"
 echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
 
 # Generate the input events
diff --git a/benchmarks/full/options/full_reconstruction.py b/benchmarks/full/options/full_reconstruction.py
index 26f07b0459a2c507c4be6b2c5d679ed86ed25c4c..6195d49bfb75f9ba3d9b76bccc9bc4114a2f3c4e 100644
--- a/benchmarks/full/options/full_reconstruction.py
+++ b/benchmarks/full/options/full_reconstruction.py
@@ -10,8 +10,8 @@ if "JUGGLER_DETECTOR" in os.environ :
   detector_name = str(os.environ["JUGGLER_DETECTOR"])
 
 detector_path = ""
-if "JUGGLER_DETECTOR_PATH" in os.environ :
-  detector_path = str(os.environ["JUGGLER_DETECTOR_PATH"])
+if "DETECTOR_PATH" in os.environ :
+  detector_path = str(os.environ["DETECTOR_PATH"])
 
 compact_path = os.path.join(detector_path, detector_name)
 
diff --git a/benchmarks/imaging_shower_ML/sim_rec_tag.py b/benchmarks/imaging_shower_ML/sim_rec_tag.py
index 1f7c4b282f4b18cb45b7542fc7aa4610da3fb763..3a7aaedbbe4183cb4122082c5fbba61bedc738ff 100755
--- a/benchmarks/imaging_shower_ML/sim_rec_tag.py
+++ b/benchmarks/imaging_shower_ML/sim_rec_tag.py
@@ -11,7 +11,7 @@ import subprocess
 import argparse
 
 
-default_compact = os.path.join(os.environ.get('JUGGLER_DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
+default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
         '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')
diff --git a/benchmarks/rich/forward_hadrons.sh b/benchmarks/rich/forward_hadrons.sh
index 4338a01128a48641507652e8d43c4e59a0d1720a..03f83143ab7b0c6aa2d807b6602c4e5f3a122482 100644
--- a/benchmarks/rich/forward_hadrons.sh
+++ b/benchmarks/rich/forward_hadrons.sh
@@ -11,7 +11,7 @@
 ## You can ready options/env.sh for more in-depth explanations of the variables
 ## and how they can be controlled.
 source options/env.sh
-export JUGGLER_DETECTOR_PATH=${DETECTOR_PATH}
+export DETECTOR_PATH=${DETECTOR_PATH}
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
   export JUGGLER_N_EVENTS=100
diff --git a/benchmarks/rich/options/rich_reco.py b/benchmarks/rich/options/rich_reco.py
index a230fae6981e884efa019fe6c264e386c4ade5b7..640fb8deff728f7b646316a53397692055c7333f 100644
--- a/benchmarks/rich/options/rich_reco.py
+++ b/benchmarks/rich/options/rich_reco.py
@@ -7,8 +7,8 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 detector_name = "topside"
 if "JUGGLER_DETECTOR" in os.environ :
   detector_name = str(os.environ["JUGGLER_DETECTOR"])
-if "JUGGLER_DETECTOR_PATH" in os.environ :
-  detector_name = str(os.environ["JUGGLER_DETECTOR_PATH"])+"/"+detector_name
+if "DETECTOR_PATH" in os.environ :
+  detector_name = str(os.environ["DETECTOR_PATH"])+"/"+detector_name
 
 # todo add checks
 input_sim_file  = str(os.environ["JUGGLER_SIM_FILE"])
diff --git a/benchmarks/tracking/central_electrons.sh b/benchmarks/tracking/central_electrons.sh
index 98ba76d655908848da141dd74e8e34eb633a5d6b..a9c2262bcacf62154e6b67c95a96e34b5fc20861 100644
--- a/benchmarks/tracking/central_electrons.sh
+++ b/benchmarks/tracking/central_electrons.sh
@@ -49,7 +49,7 @@ print_env.sh
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
 ## and how they can be controlled.
-export JUGGLER_DETECTOR_PATH=${DETECTOR_PATH}
+export DETECTOR_PATH=${DETECTOR_PATH}
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
   export JUGGLER_N_EVENTS=100
diff --git a/benchmarks/tracking/options/tracker_reconstruction.py b/benchmarks/tracking/options/tracker_reconstruction.py
index 6c27c691a12e2defc17dcc9d7f6f1d120882a034..ba2cbf0b744c15ba46c8c25e09ff1e2e03305e3e 100644
--- a/benchmarks/tracking/options/tracker_reconstruction.py
+++ b/benchmarks/tracking/options/tracker_reconstruction.py
@@ -9,8 +9,8 @@ if "JUGGLER_DETECTOR" in os.environ :
   detector_name = str(os.environ["JUGGLER_DETECTOR"])
 
 detector_path = ""
-if "JUGGLER_DETECTOR_PATH" in os.environ :
-  detector_path = str(os.environ["JUGGLER_DETECTOR_PATH"])
+if "DETECTOR_PATH" in os.environ :
+  detector_path = str(os.environ["DETECTOR_PATH"])
 
 # todo add checks
 input_sim_file  = str(os.environ["JUGGLER_SIM_FILE"])