diff --git a/docs/architecture/c4/notifhir/reporting/recorder/index.md b/docs/architecture/c4/notifhir/reporting/recorder/index.md
index 8ffd6fb15..e9db394d3 100644
--- a/docs/architecture/c4/notifhir/reporting/recorder/index.md
+++ b/docs/architecture/c4/notifhir/reporting/recorder/index.md
@@ -5,10 +5,10 @@ parent:  Reporting
 nav_order: 1
 has_children: true
 is_not_draft: false
-last_modified_date: 2025-10-24
+last_modified_date: 2026-03-26
 owner: Tom D'Roza
 author: Tom D'Roza
-diagrams: [c4code-mesh-statusreporter-recorder, sequence-nhsapp-callback]
+diagrams: [c4code-mesh-statusreporter-recorder]
 events-raised: []
 events-consumed: [
     mesh-inbox-message-downloaded,
diff --git a/docs/architecture/c4/notifhir/viewer/callback/index.md b/docs/architecture/c4/notifhir/viewer/callback/index.md
index bc54423bf..26dfc7f69 100644
--- a/docs/architecture/c4/notifhir/viewer/callback/index.md
+++ b/docs/architecture/c4/notifhir/viewer/callback/index.md
@@ -5,10 +5,10 @@ parent:  Viewer Services
 nav_order: 8
 has_children: true
 is_not_draft: false
-last_modified_date: 2024-05-28
+last_modified_date: 2026-03-26
 owner: Ross Buggins
-author: Ross Buggins
-diagrams: [c4code-nhsapp-callback, sequence-nhsapp-callback]
+author: Tom D'Roza
+diagrams: [c4code-nhsapp-status-handler]
 events-raised: [viewer-digital-letter-read]
 events-consumed: []
 c4type: code
diff --git a/docs/collections/_diagrams/c4code-nhsapp-callback.md b/docs/collections/_diagrams/c4code-nhsapp-callback.md
deleted file mode 100644
index 47fadd5a4..000000000
--- a/docs/collections/_diagrams/c4code-nhsapp-callback.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-title: c4code-nhsapp-callback
-
----
-
-```mermaid
-architecture-beta
-    group CallbackHandler(cloud)[NHSAppCallbackHandler]
-    service nhsapp(server)[NHS App]
-    service apiGateway(aws:arch-amazon-api-gateway)[API Gateway]
-    service lambda(logos:aws-lambda)[NHS App Callback Handler] in CallbackHandler
-    service sqs(logos:aws-sqs)[Callback Queue] in CallbackHandler
-    service ddb(aws:arch-amazon-dynamodb)[Items With TTL] in CallbackHandler
-    service docReadEvent(aws:res-amazon-eventbridge-event)[DigitalLetterRead Event]
-
-    nhsapp:R --> L:apiGateway
-    apiGateway:R --> L:sqs
-    sqs:R --> L:lambda
-    lambda:B --> T:ddb
-    lambda:R --> L:docReadEvent
-```
diff --git a/docs/collections/_diagrams/c4code-nhsapp-status-handler.md b/docs/collections/_diagrams/c4code-nhsapp-status-handler.md
new file mode 100644
index 000000000..0f247a28b
--- /dev/null
+++ b/docs/collections/_diagrams/c4code-nhsapp-status-handler.md
@@ -0,0 +1,20 @@
+---
+
+title: c4code-nhsapp-status-handler
+
+---
+
+```mermaid
+architecture-beta
+    group AppStatusHandler(cloud)[NHSAppStatusHandler]
+    service optedOutEvent(aws:res-amazon-eventbridge-event)[channel status PUBLISHED v1 Event]
+    service lambda(logos:aws-lambda)[App Status Handler] in AppStatusHandler
+    service sqs(logos:aws-sqs)[App Status Queue] in AppStatusHandler
+    service ddb(aws:arch-amazon-dynamodb)[Items With TTL] in AppStatusHandler
+    service docReadEvent(aws:res-amazon-eventbridge-event)[DigitalLetterRead Event]
+
+    optedOutEvent:R --> L:sqs
+    sqs:R --> L:lambda
+    lambda:B --> T:ddb
+    lambda:R --> L:docReadEvent
+```
diff --git a/docs/collections/_diagrams/sequence-nhsapp-callback.md b/docs/collections/_diagrams/sequence-nhsapp-callback.md
deleted file mode 100644
index ea3070039..000000000
--- a/docs/collections/_diagrams/sequence-nhsapp-callback.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-
-title: sequence-nhsapp-callback
-
----
-
-```mermaid
-    sequenceDiagram
-    participant nhsapp as NHSApp
-    participant apig as API Gateway
-    participant sqs as SQS<br/>Callback Queue
-    participant lambda as Lambda<br/>NHS App Callback Handler
-    participant ddb as DynamoDB<br/>Items With TTL
-    participant eb as Event Bridge
-
-    nhsapp ->> apig: POST /callback
-    activate apig
-    apig ->> sqs: Send message
-    apig -->> nhsapp: 200 OK
-    deactivate apig
-    sqs ->> lambda: Invoke asynchronously
-    activate lambda
-    lambda ->> ddb: Delete TTL
-    lambda ->> eb: DigitalLetterRead event
-    deactivate lambda
-```