diff --git a/proxies/live/apiproxy/policies/AssignMessage.AddCors.xml b/proxies/live/apiproxy/policies/AssignMessage.AddCors.xml
index a206e73..a162ba0 100644
--- a/proxies/live/apiproxy/policies/AssignMessage.AddCors.xml
+++ b/proxies/live/apiproxy/policies/AssignMessage.AddCors.xml
@@ -4,7 +4,7 @@
     <Set>
         <Headers>
             <Header name="Access-Control-Allow-Origin">{request.header.origin}</Header>
-            <Header name="Access-Control-Allow-Headers">origin, x-requested-with, accept, content-type, nhsd-session-urid, x-correlation-id, x-request-id, nhsd-end-user-organisation-ods</Header>
+            <Header name="Access-Control-Allow-Headers">origin, x-requested-with, accept, content-type, nhsd-session-urid, x-correlation-id, x-request-id, nhsd-end-user-organisation-ods, nhsd-end-user-organisation</Header>
             <Header name="Access-Control-Max-Age">3628800</Header>
             <Header name="Access-Control-Allow-Methods">GET, PUT, POST, DELETE</Header>
         </Headers>
diff --git a/proxies/sandbox/apiproxy/resources/jsc/ConnectionMetadata.SetRequestHeaders.js b/proxies/sandbox/apiproxy/resources/jsc/ConnectionMetadata.SetRequestHeaders.js
index 310852c..c571887 100644
--- a/proxies/sandbox/apiproxy/resources/jsc/ConnectionMetadata.SetRequestHeaders.js
+++ b/proxies/sandbox/apiproxy/resources/jsc/ConnectionMetadata.SetRequestHeaders.js
@@ -48,8 +48,13 @@ const nrlPointers = {
     return;
   }
 
+  var odsCodeExtension = context.getVariable(
+    "request.header.NHSD-End-User-Organisation"
+  );
+
   var connectionMetadata = {
     "nrl.ods-code": odsCode,
+    "nrl.ods-code-extension": odsCodeExtension,
     "nrl.pointer-types": nrlPointerTypes,
   };
   context.targetRequest.headers["NHSD-Connection-Metadata"] =
diff --git a/specification/record-locator/producer.yaml b/specification/record-locator/producer.yaml
index 096d3cb..f309b43 100644
--- a/specification/record-locator/producer.yaml
+++ b/specification/record-locator/producer.yaml
@@ -157,28 +157,17 @@ info:
 
     ## Onboarding
 
-    You need to get your software approved by us before it can go live with this API. We call this onboarding. The onboarding process can sometimes be quite long, so it’s worth planning well ahead.
-
-    As part of this process, you need to demonstrate that you can manage risks and that your software conforms technically with the requirements for this API.
-
-    Information on this page might impact the design of your software. For details, see [Onboarding support information](https://digital.nhs.uk/developer/api-catalogue/national-record-locator-producer-fhir/onboarding-support-information).
-
-    To understand how our online digital onboarding process works, see [digital onboarding](https://digital.nhs.uk/developer/guides-and-documentation/digital-onboarding#using-the-digital-onboarding-portal).
-
-    <div class="nhsd-m-emphasis-box nhsd-m-emphasis-box--emphasis nhsd-!t-margin-bottom-6" aria-label="Highlighted Information">
-        <div class="nhsd-a-box nhsd-a-box--border-blue">
-            <div class="nhsd-m-emphasis-box__image-box">
-                <figure class="nhsd-a-image">
-                    <picture class="nhsd-a-image__picture">
-                        <img src="http://digital.nhs.uk/binaries/content/gallery/icons/play-circle.svg?colour=231f20" alt="" style="object-fit:fill">
-                    </picture>
-                </figure>
-            </div>
-            <div class="nhsd-m-emphasis-box__content-box">
-                <div data-uipath="website.contentblock.emphasis.content" class="nhsd-t-word-break"><p class="nhsd-t-body">To get started, sign in or create a <a href="http://onboarding.prod.api.platform.nhs.uk/">developer account</a>, then select 'product onboarding'.</p></div>
-            </div>
-        </div>
-    </div>
+    You need to get your software approved by us before it can go live with this API. We call this onboarding. The
+    [onboarding](#api-description__onboarding) process can sometimes be quite long, so it’s worth planning well ahead.
+
+    This API uses our online digital [onboarding](#api-description__onboarding) process.
+
+    As part of this process, you need to demonstrate that you can manage risks and that your software conforms
+    technically with the requirements for this API.
+
+    Information on this page might impact the design of your software. For details, see [Onboarding support information](https://digital.nhs.uk/developer/guides-and-documentation/digital-onboarding).
+
+    To get started, see [digital onboarding](https://digital.nhs.uk/developer/guides-and-documentation/digital-onboarding#using-the-digital-onboarding-portal).
   version: 1.0.0
   license:
     name: MIT
@@ -1617,6 +1606,8 @@ components:
       type: string
     RequestHeaderOdsCode:
       type: string
+    RequestHeaderReceiverCode:
+      type: string
     RequestHeaderRequestId:
       type: string
       pattern: "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
@@ -1705,6 +1696,12 @@ components:
         invalid:
           summary: Unknown
           value: XYZ
+    odsCodeExtension:
+      name: NHSD-End-User-Organisation
+      description: Receiver Code for Organisation
+      in: header
+      schema:
+        $ref: "#/components/schemas/RequestHeaderReceiverCode"
     requestId:
       name: X-Request-ID
       description: |