diff --git a/CEP/Pipeline/recipes/sip/bin/runPipeline.sh b/CEP/Pipeline/recipes/sip/bin/runPipeline.sh
index 89d5e2657115c096496c259a952a235605327692..8c40f4a2247de9408baf19e88ed548060444f282 100755
--- a/CEP/Pipeline/recipes/sip/bin/runPipeline.sh
+++ b/CEP/Pipeline/recipes/sip/bin/runPipeline.sh
@@ -25,6 +25,9 @@ PARSET=
 # Location of pipeline-framework configuration file
 PIPELINE_CONFIG=$LOFARROOT/share/pipeline/pipeline.cfg
 
+# Directory for parset and feedback files
+PARSET_DIR=$LOFARROOT/var/run
+
 # ======= Parse command-line parameters
 
 function usage() {
@@ -33,10 +36,11 @@ function usage() {
   echo "  -o OBSID           Task identifier"
   echo "  -c pipeline.cfg    Override pipeline configuration file (default: $PIPELINE_CONFIG)"
   echo "  -p pipeline.parset Provide parset (default: request through QPID)"
+  echo "  -P dir             Directory to which to save parset and feedback files (default: $PARSET_DIR)"
   exit 1
 }
 
-while getopts "ho:c:p:" opt; do
+while getopts "ho:c:p:P:" opt; do
   case $opt in
     h)  usage
         ;;
@@ -46,6 +50,8 @@ while getopts "ho:c:p:" opt; do
         ;;
     p)  PARSET="$OPTARG"
         ;;
+    P)  PARSET_DIR="$OPTARG"
+        ;;
     \?) error "Invalid option: -$OPTARG"
         ;;
     :)  error "Option requires an argument: -$OPTARG"
@@ -58,7 +64,7 @@ done
 
 if [ -z "$PARSET" ]; then
   # Fetch parset
-  PARSET=${LOFARROOT}/var/run/Observation${OBSID}.parset
+  PARSET=${PARSET_DIR}/Observation${OBSID}.parset
   getOTDBParset -o $OBSID >$PARSET
 fi
 
diff --git a/MAC/Services/src/PipelineControl.py b/MAC/Services/src/PipelineControl.py
index 5a3325d3bc9f7e81f1ef045face3e5d397183d28..f3c535d09b41a9be6e6c1a415024672c572f9e4d 100755
--- a/MAC/Services/src/PipelineControl.py
+++ b/MAC/Services/src/PipelineControl.py
@@ -391,7 +391,7 @@ class PipelineControl(OTDBBusListener):
         " -e SLURM_JOB_ID=$SLURM_JOB_ID"
         " -v /data:/data"
         " {image}"
-        " runPipeline.sh -o {obsid} -c /opt/lofar/share/pipeline/pipeline.cfg.{cluster} || exit $?\n"
+        " runPipeline.sh -o {obsid} -c /opt/lofar/share/pipeline/pipeline.cfg.{cluster} -P /data/parsets || exit $?\n"
 
         # notify that we're tearing down
         "{setStatus_completing}\n"