diff --git a/mbed-tls-nightly-tests.yaml b/mbed-tls-nightly-tests.yaml
index 1be55b9..8bd3266 100644
--- a/mbed-tls-nightly-tests.yaml
+++ b/mbed-tls-nightly-tests.yaml
@@ -90,12 +90,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
+        default: arthur.she@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
+        default: arthur.she@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
         description: ''
         name: TEST_FAIL_EMAIL_ADDRESS
         trim: 'false'
@@ -108,8 +108,8 @@
       scm:
       - git:
           branches:
-          - 'leo-mbedtls-open-ci-notify-github'
-          url: https://github.com/arthur-she/mbedtls-test.git
+          - 'master'
+          url: https://github.com/ARMmbed/mbedtls-test.git
       script-path: vars/mbedtls-release-Jenkinsfile
     project-type: pipeline
     properties:
diff --git a/mbedtls-release-ci-testing.yaml b/mbedtls-release-ci-testing.yaml
index b977295..1d189dc 100644
--- a/mbedtls-release-ci-testing.yaml
+++ b/mbedtls-release-ci-testing.yaml
@@ -112,17 +112,17 @@
         name: PUSH_COVERITY
     - git-parameter:
         name: TEST_BRANCH
-        description: Branch or tag in https://github.com/arthur-she/mbedtls-test (forks are not supported)
+        description: Branch or tag in https://github.com/ARMmbed/mbedtls-test (forks are not supported)
         type: PT_BRANCH_TAG
         quickFilterEnabled: True
-        defaultValue: leo-mbedtls-open-ci-notify-github
+        defaultValue: master
     pipeline-scm:
       lightweight-checkout: false
       scm:
       - git:
           branches:
           - ${TEST_BRANCH}
-          url: https://github.com/arthur-she/mbedtls-test.git
+          url: https://github.com/ARMmbed/mbedtls-test.git
       script-path: vars/mbedtls-release-Jenkinsfile
     project-type: pipeline
     properties:
@@ -145,7 +145,7 @@
         load-from-master: false
         override-build-parameters: false
         properties-content: |-
-          GIT_CREDENTIALS_ID= d015f9b1-4800-4a81-86b3-9dbadc18ee00
-          TEST_PASS_EMAIL_ADDRESS=arthur.she@linaro.org
-          TEST_FAIL_EMAIL_ADDRESS=arthur.she@linaro.org
+          GIT_CREDENTIALS_ID=mbedtls-github-ssh
+          TEST_PASS_EMAIL_ADDRESS=arthur.she@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com
+          TEST_FAIL_EMAIL_ADDRESS=arthur.she@linaro.org,CE-OSS-Firmware-Crypto-TLS@arm.com,darryl.green@arm.com