diff --git a/manta.wdl b/manta.wdl
index 546d468c166fa75a615b63e836aa83a76f316f6e..f2e1d43d37947ed71c48de543683079fce9bf8a5 100644
--- a/manta.wdl
+++ b/manta.wdl
@@ -10,7 +10,7 @@ task Somatic {
         File? normalBamIndex
         File referenceFasta
         File referenceFastaFai
-        String runDir = "."
+        String runDir = "./manta_run"
         File? callRegions
         File? callRegionsIndex
         Boolean exome = false
@@ -22,8 +22,6 @@ task Somatic {
     }
 
     command {
-        mkdir -p ~{runDir}
-        set -e
         configManta.py \
         ~{"--normalBam " + normalBam} \
         ~{"--tumorBam " + tumorBam} \
diff --git a/strelka.wdl b/strelka.wdl
index 262d3fdc5a12edc75e7fb36cc4f39e16dac28141..f5cd525df88e1569b17c9f304264fc1cb5d202c1 100644
--- a/strelka.wdl
+++ b/strelka.wdl
@@ -4,7 +4,7 @@ import "common.wdl" as common
 
 task Germline {
     input {
-        String runDir = "."
+        String runDir = "./strelka_run"
         Array[File]+ bams
         Array[File]+ indexes
         File referenceFasta
@@ -20,8 +20,6 @@ task Germline {
     }
 
     command {
-        set -e
-        mkdir -p ~{runDir}
         configureStrelkaGermlineWorkflow.py \
         --bam ~{sep=" --bam " bams} \
         --ref ~{referenceFasta} \
@@ -50,7 +48,7 @@ task Germline {
 
 task Somatic {
     input {
-        String runDir = "."
+        String runDir = "./strelka_run"
         File normalBam
         File normalBamIndex
         File tumorBam
@@ -71,8 +69,6 @@ task Somatic {
     }
 
     command {
-        set -e
-        mkdir -p ~{runDir}
         configureStrelkaSomaticWorkflow.py \
         --normalBam ~{normalBam} \
         --tumorBam ~{tumorBam} \