diff --git a/doc/json/primary-emergency-fhir-result.json b/doc/json/primary-emergency-fhir-result.json
index a968aa0a..78704328 100644
--- a/doc/json/primary-emergency-fhir-result.json
+++ b/doc/json/primary-emergency-fhir-result.json
@@ -776,7 +776,7 @@
       "id": "387eeaec-029d-4f75-ad04-e5f9792548b9",
       "text": {
         "status": "generated",
-        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n                                                    <table>\n                                                        <tbody>\n                                                            <tr>\n                                                                <th>Permission to view outcome</th>\n                                                                <td>Permission to view obtained</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date obtained</th>\n                                                                <td>01-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date expires</th>\n                                                                <td>15-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                        </tbody>\n                                                    </table>\n                                                </div>"
+        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n                                                    <table xmlns=\"urn:hl7-org:v3\" xmlns:npfitlc=\"NPFIT:HL7:Localisation\">\n                                                        <tbody>\n                                                            <tr>\n                                                                <th>Permission to view outcome</th>\n                                                                <td>Permission to view obtained</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date obtained</th>\n                                                                <td>01-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date expires</th>\n                                                                <td>15-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                        </tbody>\n                                                    </table>\n                                                </div>"
       },
       "identifier": {
         "use": "usual",
diff --git a/service/build.gradle b/service/build.gradle
index 9b9eb7ff..99ef463b 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.apache.qpid:qpid-jms-client:2.6.1'
     implementation 'org.springframework:spring-jms'
-    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:5.7.2'
+    implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:8.2.1'
     implementation 'uk.nhs.connect.iucds:iucds-schema:3.0.RC1.2'
     implementation 'org.apache.xmlbeans:xmlbeans:3.1.0'
     implementation 'com.rabbitmq.jms:rabbitmq-jms:3.4.0'
diff --git a/service/src/integration-test/java/uk/nhs/adaptors/oneoneone/cda/report/controller/ReportControllerIT.java b/service/src/integration-test/java/uk/nhs/adaptors/oneoneone/cda/report/controller/ReportControllerIT.java
index b33bf0eb..78eb7964 100644
--- a/service/src/integration-test/java/uk/nhs/adaptors/oneoneone/cda/report/controller/ReportControllerIT.java
+++ b/service/src/integration-test/java/uk/nhs/adaptors/oneoneone/cda/report/controller/ReportControllerIT.java
@@ -305,7 +305,7 @@ private void postReportValidBody(String itkReportRequestPath, String expectedJso
         overwriteJson(expectedJsonPath, messageBody);
         assertThat(validator.isValid(messageBody)).isEqualTo(true);
         assertThat(jmsMessage.getStringProperty(MESSAGE_ID)).isEqualTo(messageIdValue);
-        assertMessageContent(messageBody, readResourceAsString(expectedJsonPath));
+        assertMessageContent(readResourceAsString(expectedJsonPath), messageBody);
     }
 
     @SneakyThrows
@@ -321,7 +321,7 @@ private void overwriteJson(String expectedJsonPath, String messageBody) {
         }
     }
 
-    private void assertMessageContent(String actual, String expected) throws JSONException {
+    private void assertMessageContent(String expected, String actual) throws JSONException {
         LOGGER.info("Validating message content:\n{}", actual);
 
         //when comparing json objects, this will ignore various json paths that contain random values like ids or timestamps
diff --git a/service/src/integration-test/resources/json/primary-emergency-fhir-result.json b/service/src/integration-test/resources/json/primary-emergency-fhir-result.json
index a968aa0a..78704328 100644
--- a/service/src/integration-test/resources/json/primary-emergency-fhir-result.json
+++ b/service/src/integration-test/resources/json/primary-emergency-fhir-result.json
@@ -776,7 +776,7 @@
       "id": "387eeaec-029d-4f75-ad04-e5f9792548b9",
       "text": {
         "status": "generated",
-        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n                                                    <table>\n                                                        <tbody>\n                                                            <tr>\n                                                                <th>Permission to view outcome</th>\n                                                                <td>Permission to view obtained</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date obtained</th>\n                                                                <td>01-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date expires</th>\n                                                                <td>15-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                        </tbody>\n                                                    </table>\n                                                </div>"
+        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n                                                    <table xmlns=\"urn:hl7-org:v3\" xmlns:npfitlc=\"NPFIT:HL7:Localisation\">\n                                                        <tbody>\n                                                            <tr>\n                                                                <th>Permission to view outcome</th>\n                                                                <td>Permission to view obtained</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date obtained</th>\n                                                                <td>01-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                            <tr>\n                                                                <th>Date expires</th>\n                                                                <td>15-Jan-2017, 20:00</td>\n                                                            </tr>\n                                                        </tbody>\n                                                    </table>\n                                                </div>"
       },
       "identifier": {
         "use": "usual",