diff --git a/mbed-tls-nightly-tests.yaml b/mbed-tls-nightly-tests.yaml
index 8d3e46a..abf1863 100644
--- a/mbed-tls-nightly-tests.yaml
+++ b/mbed-tls-nightly-tests.yaml
@@ -1,7 +1,7 @@
 - job:
     concurrent: true
     description: Mbed TLS Nightly Tests
-    disabled: true
+    disabled: false
     name: mbed-tls-nightly-tests
     parameters:
     - string:
@@ -27,6 +27,10 @@
         name: RUN_ALL_SH
     - bool:
         default: true
+        description: Run a selection of all.sh on FreeBSD
+        name: RUN_FREEBSD
+    - bool:
+        default: true
         description: Run Windows tests
         name: RUN_WINDOWS_TEST
     - bool:
@@ -90,12 +94,12 @@
           For the list of Mbed OS Gold and Silver boards, see <a href="https://confluence.arm.com/display/IoTBU/ISG+Device+SW+SUT+list">here</a>
         name: PLATFORMS_TO_TEST
     - string:
-        default: arthur.she@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
+        default: arthur.she@linaro.org,kelley.spoon@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
         description: ''
         name: TEST_PASS_EMAIL_ADDRESS
         trim: 'false'
     - string:
-        default: arthur.she@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
+        default: arthur.she@linaro.org,kelley.spoon@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
         description: ''
         name: TEST_FAIL_EMAIL_ADDRESS
         trim: 'false'
@@ -113,6 +117,8 @@
       script-path: vars/mbedtls-release-Jenkinsfile
     project-type: pipeline
     properties:
+    - speed-durability:
+        hint: performance-optimized
     - build-blocker:
         block-level: GLOBAL
         blocking-jobs: []
@@ -132,4 +138,4 @@
         properties-content: GIT_CREDENTIALS_ID=mbedtls-github-token
     triggers:
     - parameterized-timer:
-        cron: "H(0-29) 0 * * * %MBED_TLS_BRANCH=development \nH(0-29) 2 * * * %MBED_TLS_BRANCH=mbedtls-2.28\nH(0-29) 4 * * * %MBED_TLS_BRANCH=features/new-code-style/development\nH(0-29) 6 * * * %MBED_TLS_BRANCH=features/new-code-style/mbedtls-2.28"
+        cron: "H(0-29) 0 * * * %MBED_TLS_BRANCH=development \nH(0-29) 2 * * * %MBED_TLS_BRANCH=mbedtls-2.28"