diff --git a/src/contractTest/resources/application.yml b/src/contractTest/resources/application.yml
index f8d40e6601..df55965158 100644
--- a/src/contractTest/resources/application.yml
+++ b/src/contractTest/resources/application.yml
@@ -222,7 +222,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "01bfc52c-0850-4155-ae03-e6d638286288"
           documentReceived: "24161fba-65f5-4384-9c4f-ef75f4a5c666"
           caseStopped: "60b95b7c-0a76-4608-b549-b3a579cfa3d0"
-          caseStoppedCaveat: "937291a0-c0ae-40a4-a8cf-46a3452faff0"
+          caseStoppedCaveat: "d5084257-f475-415a-b7d0-2427b5c580b1"
           grantIssued: "227bc051-8210-4030-b669-6eee2cbe075e"
           grantReissued: "1b094aae-1b4e-4161-9a61-f563a1a6ed6d"
           generalCaveatMessage: "afadf00e-c224-4da0-a6dc-fb47a2e5db67"
@@ -246,7 +246,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "01bfc52c-0850-4155-ae03-e6d638286288"
           documentReceived: "e618dce9-405e-45a5-86e8-06d792336f2f"
           caseStopped: "9e93a9c8-0246-4a95-b792-1c02da4bed4e"
-          caseStoppedCaveat: "937291a0-c0ae-40a4-a8cf-46a3452faff0"
+          caseStoppedCaveat: "d5084257-f475-415a-b7d0-2427b5c580b1"
           grantIssued: "0ba9fc37-acfc-47ee-b1ca-f630c921f14d"
           grantReissued: "9b0e4091-8c94-41bc-8e6c-de4bc211f68f"
           generalCaveatMessage: "afadf00e-c224-4da0-a6dc-fb47a2e5db67"
@@ -271,7 +271,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "22c81233-a213-4520-b6bc-896fe8f6988a"
           documentReceived: "39b7cef5-8202-479e-9f1e-86a76f964221"
           caseStopped: "80b576b4-1a33-4920-837a-f2904784c9e2"
-          caseStoppedCaveat: "1fde1860-b827-45e7-b430-1406f74beb93"
+          caseStoppedCaveat: "4aec6fa3-7e76-406a-9953-2f12d5d29f81"
           grantIssued: "515c7643-ea3b-4a86-9b94-4622114be080"
           grantReissued: "c5232b10-0975-4085-ba5a-3e5a6eb5c2bf"
           generalCaveatMessage: "d2b33c5b-0c65-4472-b26f-9352de5538ba"
@@ -294,7 +294,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "22c81233-a213-4520-b6bc-896fe8f6988a"
           documentReceived: "83f93f41-58a1-44f2-a9c4-d20d545b7528"
           caseStopped: "a767a0bd-4acc-413e-b510-5a71d24daf85"
-          caseStoppedCaveat: "937291a0-c0ae-40a4-a8cf-46a3452faff0"
+          caseStoppedCaveat: "4aec6fa3-7e76-406a-9953-2f12d5d29f81"
           grantIssued: "0ba9fc37-acfc-47ee-b1ca-f630c921f14d"
           grantReissued: "9b0e4091-8c94-41bc-8e6c-de4bc211f68f"
           generalCaveatMessage: "afadf00e-c224-4da0-a6dc-fb47a2e5db67"
diff --git a/src/functionalTest/java/uk/gov/hmcts/probate/functional/notifications/SolBaCcdServiceNotificationTests.java b/src/functionalTest/java/uk/gov/hmcts/probate/functional/notifications/SolBaCcdServiceNotificationTests.java
index 437d94aeae..c021adbfd3 100644
--- a/src/functionalTest/java/uk/gov/hmcts/probate/functional/notifications/SolBaCcdServiceNotificationTests.java
+++ b/src/functionalTest/java/uk/gov/hmcts/probate/functional/notifications/SolBaCcdServiceNotificationTests.java
@@ -35,7 +35,7 @@ public class SolBaCcdServiceNotificationTests extends IntegrationTestBase {
     private static final String PAPER_FORM = "/case/paperForm";
 
     private static final String BIRMINGHAM_NO = "0300 303 0648";
-    private static final String REGISTRY_NO = "0113 389 6133";
+    private static final String REGISTRY_NO = " 0300 303 0648";
 
     private static final String EMAIL_NOTIFICATION_URL =
         "data.probateNotificationsGenerated[0].value.DocumentLink.document_binary_url";
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 66b00b5445..1de0085bf0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -258,7 +258,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "01bfc52c-0850-4155-ae03-e6d638286288"
           documentReceived: "24161fba-65f5-4384-9c4f-ef75f4a5c666"
           caseStopped: "60b95b7c-0a76-4608-b549-b3a579cfa3d0"
-          caseStoppedCaveat: "937291a0-c0ae-40a4-a8cf-46a3452faff0"
+          caseStoppedCaveat: "d5084257-f475-415a-b7d0-2427b5c580b1"
           grantIssued: "53374eda-d7a1-4651-bd29-65672ac0137a"
           grantReissued: "b1977c1f-b998-48c3-b848-bc5d86c58b2e"
           generalCaveatMessage: "afadf00e-c224-4da0-a6dc-fb47a2e5db67"
@@ -283,7 +283,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "01bfc52c-0850-4155-ae03-e6d638286288"
           documentReceived: "e618dce9-405e-45a5-86e8-06d792336f2f"
           caseStopped: "9e93a9c8-0246-4a95-b792-1c02da4bed4e"
-          caseStoppedCaveat: "937291a0-c0ae-40a4-a8cf-46a3452faff0"
+          caseStoppedCaveat: "d5084257-f475-415a-b7d0-2427b5c580b1"
           grantIssued: "0ba9fc37-acfc-47ee-b1ca-f630c921f14d"
           grantReissued: "9b0e4091-8c94-41bc-8e6c-de4bc211f68f"
           generalCaveatMessage: "afadf00e-c224-4da0-a6dc-fb47a2e5db67"
@@ -309,7 +309,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "22c81233-a213-4520-b6bc-896fe8f6988a"
           documentReceived: "39b7cef5-8202-479e-9f1e-86a76f964221"
           caseStopped: "80b576b4-1a33-4920-837a-f2904784c9e2"
-          caseStoppedCaveat: "1fde1860-b827-45e7-b430-1406f74beb93"
+          caseStoppedCaveat: "4aec6fa3-7e76-406a-9953-2f12d5d29f81"
           grantIssued: "7ce2c312-e4ec-4e63-a48b-82180d9a4160"
           grantReissued: "c4436722-33df-4945-af93-b4d84525b4e6"
           generalCaveatMessage: "d2b33c5b-0c65-4472-b26f-9352de5538ba"
@@ -332,7 +332,7 @@ notifications:
           applicationReceivedPaperFormCaseworker: "22c81233-a213-4520-b6bc-896fe8f6988a"
           documentReceived: "83f93f41-58a1-44f2-a9c4-d20d545b7528"
           caseStopped: "a767a0bd-4acc-413e-b510-5a71d24daf85"
-          caseStoppedCaveat: "937291a0-c0ae-40a4-a8cf-46a3452faff0"
+          caseStoppedCaveat: "4aec6fa3-7e76-406a-9953-2f12d5d29f81"
           grantIssued: "0ba9fc37-acfc-47ee-b1ca-f630c921f14d"
           grantReissued: "9b0e4091-8c94-41bc-8e6c-de4bc211f68f"
           generalCaveatMessage: "afadf00e-c224-4da0-a6dc-fb47a2e5db67"