diff --git a/Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/include/TPCInterpolationWorkflow/TPCResidualAggregatorSpec.h b/Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/include/TPCInterpolationWorkflow/TPCResidualAggregatorSpec.h
index e62350cff8d19..c5bec8b59d4b9 100644
--- a/Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/include/TPCInterpolationWorkflow/TPCResidualAggregatorSpec.h
+++ b/Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/include/TPCInterpolationWorkflow/TPCResidualAggregatorSpec.h
@@ -62,7 +62,7 @@ class ResidualAggregatorDevice : public o2::framework::Task
       storeMetaFile = true;
     }
     if (!mWriteOutput && (outputDirConf != "none" || storeMetaFile)) {
-      LOGF(alarm, "File output is disabled, but output directory %s was specified and meta file storage is set to %i", outputDirConf, storeMetaFile);
+      LOGF(info, "File output is disabled, but output directory %s was specified and meta file storage is set to %i. No output file will be written", outputDirConf, storeMetaFile);
       storeMetaFile = false;
     }
     mAggregator = std::make_unique<o2::tpc::ResidualAggregator>(minEnt);
diff --git a/prodtests/full-system-test/aggregator-workflow.sh b/prodtests/full-system-test/aggregator-workflow.sh
index 2581e057bcd1b..e8dc8bb7925c9 100755
--- a/prodtests/full-system-test/aggregator-workflow.sh
+++ b/prodtests/full-system-test/aggregator-workflow.sh
@@ -30,6 +30,21 @@ if [[ "0$GEN_TOPO_VERBOSE" == "01" ]]; then
   echo "CCDB_POPULATOR_UPLOAD_PATH = $CCDB_POPULATOR_UPLOAD_PATH" 1>&2
 fi
 
+# Additional settings for calibration workflows
+if [[ -z $CALIB_DIR ]]; then CALIB_DIR=$FILEWORKDIR; fi # Directory where to store output from calibration workflows
+
+# All meta files go into the same directory
+if [[ -z $CALIB_METAFILES_DIR ]]; then
+  if [[ ! -z $CTF_METAFILES_DIR ]]; then
+    CALIB_METAFILES_DIR=$CTF_METAFILES_DIR
+  else
+    CALIB_METAFILES_DIR="/dev/null"
+  fi
+fi
+
+if [[ $RUNTYPE == "SYNTHETIC" ]]; then DISABLE_CALIB_OUTPUT="--disable-root-output"; fi
+
+
 # Adding calibrations
 EXTRA_WORKFLOW_CALIB=
 
@@ -174,9 +189,7 @@ if [[ $AGGREGATOR_TASKS == BARREL_TF ]] || [[ $AGGREGATOR_TASKS == ALL ]]; then
   fi
   # TPC
   if [[ $CALIB_TPC_SCDCALIB == 1 ]]; then
-    # TODO: the residual aggregator should have --output-dir and --meta-output-dir defined
-    # without that the residuals will be stored in the local working directory (and deleted after a week)
-    add_W o2-calibration-residual-aggregator "--disable-root-input $ENABLE_TRACK_INPUT $CALIB_TPC_SCDCALIB_CTP_INPUT --output-type trackParams,unbinnedResid,binnedResid --autosave-interval $RESIDUAL_AGGREGATOR_AUTOSAVE"
+    add_W o2-calibration-residual-aggregator "--disable-root-input $DISABLE_CALIB_OUTPUT $ENABLE_TRACK_INPUT $CALIB_TPC_SCDCALIB_CTP_INPUT --output-dir $CALIB_DIR --meta-output-dir $CALIB_METAFILES_DIR --autosave-interval $RESIDUAL_AGGREGATOR_AUTOSAVE"
   fi
   if [[ $CALIB_TPC_VDRIFTTGL == 1 ]]; then
     # options available via ARGS_EXTRA_PROCESS_o2_tpc_vdrift_tgl_calibration_workflow="--nbins-tgl 20 --nbins-dtgl 50 --max-tgl-its 2. --max-dtgl-itstpc 0.15 --min-entries-per-slot 1000 --time-slot-seconds 600 <--vdtgl-histos-file-name name> "