diff --git a/examples/dds/fairmq-start-ex-dds.sh.in b/examples/dds/fairmq-start-ex-dds.sh.in
index daef100c..bcadf6e5 100755
--- a/examples/dds/fairmq-start-ex-dds.sh.in
+++ b/examples/dds/fairmq-start-ex-dds.sh.in
@@ -78,10 +78,11 @@ dds-info --active-topology
 dds-topology --stop
 dds-info --active-topology
 
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
+# TODO Simplify, see https://github.com/FairRootGroup/DDS/issues/369
+if dds-agent-cmd getlog -a; then
+  logDir=$(eval "echo $(dds-user-defaults --key server.sandbox_dir)/log/agents")
+  echo "AGENT LOG FILES IN: ${logDir}"
+fi
 
 # This string is used by ctest to detect success
 echo "Example successful :)"
diff --git a/examples/n-m/fairmq-start-ex-n-m-dds.sh.in b/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
index e9e9ef9b..35fc3835 100755
--- a/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
@@ -69,10 +69,11 @@ dds-info --active-topology
 dds-topology --stop
 dds-info --active-topology
 
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
+# TODO Simplify, see https://github.com/FairRootGroup/DDS/issues/369
+if dds-agent-cmd getlog -a; then
+  logDir=$(eval "echo $(dds-user-defaults --key server.sandbox_dir)/log/agents")
+  echo "AGENT LOG FILES IN: ${logDir}"
+fi
 
 # This string is used by ctest to detect success
 echo "Example successful :)"
diff --git a/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in b/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
index b3a9cd5e..9cd4dc1e 100755
--- a/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
@@ -69,10 +69,11 @@ dds-info --active-topology
 dds-topology --stop
 dds-info --active-topology
 
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
+# TODO Simplify, see https://github.com/FairRootGroup/DDS/issues/369
+if dds-agent-cmd getlog -a; then
+  logDir=$(eval "echo $(dds-user-defaults --key server.sandbox_dir)/log/agents")
+  echo "AGENT LOG FILES IN: ${logDir}"
+fi
 
 # This string is used by ctest to detect success
 echo "Example successful :)"
diff --git a/examples/qc/fairmq-start-ex-qc.sh.in b/examples/qc/fairmq-start-ex-qc.sh.in
index 57a70f32..40d8baeb 100755
--- a/examples/qc/fairmq-start-ex-qc.sh.in
+++ b/examples/qc/fairmq-start-ex-qc.sh.in
@@ -76,10 +76,11 @@ dds-info --active-topology
 dds-topology --stop
 dds-info --active-topology
 
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
+# TODO Simplify, see https://github.com/FairRootGroup/DDS/issues/369
+if dds-agent-cmd getlog -a; then
+  logDir=$(eval "echo $(dds-user-defaults --key server.sandbox_dir)/log/agents")
+  echo "AGENT LOG FILES IN: ${logDir}"
+fi
 
 # This string is used by ctest to detect success
 echo "Example successful :)"