diff --git a/runner/main/jobtypes/performance/performance.sh b/runner/main/jobtypes/performance/performance.sh
index 732e928..6263b4f 100644
--- a/runner/main/jobtypes/performance/performance.sh
+++ b/runner/main/jobtypes/performance/performance.sh
@@ -153,8 +153,6 @@ function performance_generate_test_data() {
     local testplancmd
     performance_testplan_generator_command testplancmd # By nameref.
     echo "Running: docker exec -i -t -u www-data "${WEBSERVER}" "${testplancmd[@]}""
-    echo "_===> PAUSING - Hit Enter to run test <===_"
-    read
     testplanfiles=$(docker exec -i -t -u www-data "${WEBSERVER}" "${testplancmd[@]}")
 
     # Display the captured output
@@ -164,9 +162,9 @@ function performance_generate_test_data() {
 
     # Ensure the directory exists and is writable
     mkdir -p "${SHAREDDIR}/planfiles"
-    mkdir -p "${SHAREDDIR}/logs"
-    mkdir -p "${SHAREDDIR}/results"
-    mkdir -p "${SHAREDDIR}/runs"
+    mkdir -p "${SHAREDDIR}/output/logs"
+    mkdir -p "${SHAREDDIR}/output/results"
+    mkdir -p "${SHAREDDIR}/output/runs"
 
     chmod -R 2777 "${SHAREDDIR}"
 
@@ -201,7 +199,7 @@ function performance_run() {
     siteversion=""
     sitebranch="${MOODLE_BRANCH}"
     sitecommit="${MOODLE_BRANCH}"
-    runoutput="${SHAREDDIR}/results/$datestring.output"
+    runoutput="${SHAREDDIR}/output/results/$datestring.output"
 
     # Calculate the command to run. The function will return the command in the passed array.
     local jmeterruncmd=
@@ -216,15 +214,11 @@ function performance_run() {
     echo docker run ${dockerrunargs[@]} ${jmeterruncmd[@]}
     docker run "${dockerrunargs[@]}" ${jmeterruncmd[@]} | tee "${runoutput}"
     EXITCODE=$?
-    echo "============================================================================"
-    echo "============================================================================"
-    echo "============================================================================"
-read
 
     # Grep the logs looking for errors and warnings.
     for errorkey in ERROR WARN; do
       # Also checking that the errorkey is the log entry type.
-      if grep $errorkey "${SHAREDDIR}/logs/jmeter.log" | awk '{print $3}' | grep -q $errorkey ; then
+      if grep $errorkey "${SHAREDDIR}/output/logs/jmeter.log" | awk '{print $3}' | grep -q $errorkey ; then
         echo "Error: \"$errorkey\" found in jmeter logs, read $logfile to see the full trace."
         EXITCODE=1
       fi
@@ -239,8 +233,6 @@ read
 
 # Performance job type teardown.
 function performance_teardown() {
-    # Need to copy the results from the jmeter test into the shared directory.
-    # cp "${SHAREDDIR}"/timing.json "${timingpath}"
     echo "TODO: Copy results to results directory for persistence into S3"
 }
 
@@ -251,12 +243,8 @@ function performance_teardown() {
 function performance_main_command() {
     local -n _cmd=$1 # Return by nameref.
 
-    # Uses the test plan specified in the CLI call.
-    logfile="logs/jmeter.$datestring.log"
-
-    includelogs=1
-
     # Include logs string.
+    includelogs=1
     includelogsstr="-Jincludelogs=$includelogs"
     samplerinitstr="-Jbeanshell.listener.init=recorderfunctions.bsf"
 
@@ -265,7 +253,7 @@ function performance_main_command() {
     # Build the complete perf command for the run.
         _cmd=(
             -n \
-            -j "/shared/logs/jmeter.log" \
+            -j "/shared/output/logs/jmeter.log" \
             -t "$testplanfile" \
             -Jusersfile="$testusersfile" \
             -Jgroup="$group" \
@@ -276,7 +264,6 @@ function performance_main_command() {
             -Jusers=5 -Jloops=1 -Jrampup=1 -Jthroughput=120 \
             $samplerinitstr $includelogsstr
         )
-            #$includelogsstr $users $loops $rampup $throughput
 }
 
 function perfomance_testsite_generator_command() {
diff --git a/runner/main/modules/docker-jmeter/docker-jmeter.sh b/runner/main/modules/docker-jmeter/docker-jmeter.sh
index 6c92214..593838c 100644
--- a/runner/main/modules/docker-jmeter/docker-jmeter.sh
+++ b/runner/main/modules/docker-jmeter/docker-jmeter.sh
@@ -47,7 +47,7 @@ function docker-jmeter_setup() {
     echo "============================================================================"
 
     # Start the jmeter server
-    docker pull alpine/jmeter:2.11
+    docker pull alpine/jmeter:latest
 
     cp -rf "${BASEDIR}"/modules/docker-jmeter/libraries/* "${SHAREDDIR}"
 
@@ -64,6 +64,6 @@ function docker-jmeter_run_args() {
             -u `id -u` \
     	    -v "${SHAREDDIR}:/shared" \
 	        -w /shared \
-            alpine/jmeter:2.11
+            alpine/jmeter:latest
     )
 }
diff --git a/runner/main/modules/docker-jmeter/libraries/recorderfunctions.bsf b/runner/main/modules/docker-jmeter/libraries/recorderfunctions.bsf
index 97a450b..e289828 100644
--- a/runner/main/modules/docker-jmeter/libraries/recorderfunctions.bsf
+++ b/runner/main/modules/docker-jmeter/libraries/recorderfunctions.bsf
@@ -4,7 +4,7 @@ import org.apache.jmeter.util.JMeterUtils;      // http://jakarta.apache.org/jme
 
 
 testStarted(){
-    String filenamepath = "runs/tmpfilename.php";
+    String filenamepath = "output/runs/rundata.php";
     FileWriter fstream = new FileWriter(filenamepath, true);
     BufferedWriter out = new BufferedWriter(fstream);
     out.write("<?php\n");
@@ -12,7 +12,7 @@ testStarted(){
 }
 
 testEnded(){
-    File from = new File("runs/tmpfilename.php");
+    File from = new File("output/runs/rundata.php");
     File to = new File(JMeterUtils.getProperty("filepath"));
     from.renameTo(to);
     to.setReadable(true, false);
diff --git a/runner/main/modules/docker-php/config.template.php b/runner/main/modules/docker-php/config.template.php
index 328a8b2..a2259c9 100644
--- a/runner/main/modules/docker-php/config.template.php
+++ b/runner/main/modules/docker-php/config.template.php
@@ -75,7 +75,7 @@
 $CFG->phpunit_prefix = 't_';
 
 // Set the generated users password to avoid the default non-loggeable one.
-$CFG->tool_generator_users_password = '%%toolgeneratorpassword%%';
+$CFG->tool_generator_users_password = 'toolgeneratorpassword';
 
 if (\moodlehq_ci_runner::job_type_matches('behat')) {
     // Configure behat.