diff --git a/mbed-tls-nightly-tests.yaml b/mbed-tls-nightly-tests.yaml
index 173b6f5..4b4f20d 100644
--- a/mbed-tls-nightly-tests.yaml
+++ b/mbed-tls-nightly-tests.yaml
@@ -31,12 +31,12 @@
         description: Run Windows tests
         name: RUN_WINDOWS_TEST
     - string:
-        default: 'CE-OSS-SecurityLibs-ALL@arm.com,arthur.she@linaro.org,kelley.spoon@linaro.org'
+        default: 'CE-OSS-Firmware-Crypto-TLS@arm.com,arthur.she@linaro.org,kelley.spoon@linaro.org'
         description: E-mail addresses (delimited by ,) that a report should be sent to when the test run passes
         name: TEST_PASS_EMAIL_ADDRESS
         trim: true
     - string:
-        default: 'CE-OSS-SecurityLibs-ALL@arm.com,arthur.she@linaro.org,kelley.spoon@linaro.org'
+        default: 'CE-OSS-Firmware-Crypto-TLS@arm.com,arthur.she@linaro.org,kelley.spoon@linaro.org'
         description: E-mail addresses (delimited by ,) that a report should be sent to when the test run fails
         name: TEST_FAIL_EMAIL_ADDRESS
         trim: true
diff --git a/mbedtls-restricted-release-new.yaml b/mbedtls-restricted-release-new.yaml
index f187fe4..8ff738f 100644
--- a/mbedtls-restricted-release-new.yaml
+++ b/mbedtls-restricted-release-new.yaml
@@ -33,12 +33,12 @@
     - string:
         name: TEST_PASS_EMAIL_ADDRESS
         description: E-mail addresses (delimited by ,) that a report should be sent to when the test run passes
-        default: 'CE-OSS-SecurityLibs-ALL@arm.com,arthur.she@linaro.org'
+        default: 'CE-OSS-Firmware-Crypto-TLS@arm.com,arthur.she@linaro.org'
         trim: true
     - string:
         name: TEST_FAIL_EMAIL_ADDRESS
         description: E-mail addresses (delimited by ,) that a report should be sent to when the test run fails
-        default: 'CE-OSS-SecurityLibs-ALL@arm.com,arthur.she@linaro.org'
+        default: 'CE-OSS-Firmware-Crypto-TLS@arm.com,arthur.she@linaro.org'
         trim: true
     pipeline-scm:
       lightweight-checkout: true