diff --git a/run-mmpol.sh b/run-mmpol.sh
index 0e493ba24929f36a74791feca8558339b4cb8438..1216b9c454244a7c9a00b827aee7adb830077a69 100755
--- a/run-mmpol.sh
+++ b/run-mmpol.sh
@@ -5,6 +5,7 @@
 # gather info to map mmapplypolicy to runtime configuration
 # arguments passed via job env and runtime context
 
+filesystem=${FILESYSTEM:-scratch}
 policyfile=$POLICYFILE
 tmpglobal=$DIR
 tmpscratch=$DIR
@@ -17,7 +18,7 @@ DATESTR=`date +'%Y-%m-%d-%H:%M:%S'`
 policy=`basename $policyfile`
 filetag="${policy}_slurm-${SLURM_JOBID}_${DATESTR}"
 
-cmd="mmapplypolicy scratch -I prepare \
+cmd="mmapplypolicy ${filesystem} -I prepare \
   -P $policyfile \
   -g $tmpglobal \
   -s $tmpscratch \
diff --git a/submit-pol-job b/submit-pol-job
index 3b429f33c21026be325cd53e46332ed386ed3880..0d911b760f3c558c9bf4a7ff134518ce0260b943 100755
--- a/submit-pol-job
+++ b/submit-pol-job
@@ -8,9 +8,10 @@ nodes=$3
 cores=$4
 ram=$5
 partition=$6
+filesystem=${7:-scratch}
 
-DIR=$outdir POLICYFILE=$policy && \
-DIR=$DIR POLICYFILE=$POLICYFILE \
+DIR=$outdir POLICYFILE=$policy FILESYSTEM=${filesystem} && \
+DIR=$DIR POLICYFILE=$POLICYFILE FILESYSTEM=${FILESYSTEM} \
 sbatch \
    -N $nodes \
    -c $cores \