diff --git a/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh b/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
index 7eb581f6e25829e6664e2e2be0ce7a6b95141498..297fa9e6332b40c866137742b7e10e363146ade7 100644
--- a/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
+++ b/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
@@ -10,10 +10,13 @@
 
 if [ -z "${TDAQ_RELEASE_BASE}" ]; then
 
-    if [ -d /afs/cern.ch/atlas/project/tdaq/prod ]; then
+    if [ -d /cvmfs/atlas.cern.ch/repo/sw/tdaq ]; then
+        export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/tdaq
+    elif [ -d /afs/cern.ch/atlas/project/tdaq/prod ]; then
         export TDAQ_RELEASE_BASE=/afs/cern.ch/atlas/project/tdaq/prod
-    elif [ -d /cvmfs/atlas.cern.ch/repo/sw/software/21.0 ]; then
-        export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/software/21.0
+    else
+        echo "Error: Cannot find TDAQ software installation"
+        return 1
     fi
     echo "Set TDAQ_RELEASE_BASE = ${TDAQ_RELEASE_BASE}"