diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CallTypeButtons.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CallTypeButtons.json
index 1e19cf1a7e..631f6feca8 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CallTypeButtons.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CallTypeButtons.json
@@ -18,32 +18,26 @@
     "category": "non-data"
   },
   {
-    "name": "blank",
-    "label": "Blank",
-    "type": "button",
-    "category": "non-data"
-  },
-  {
-    "name": "joke",
-    "label": "Joke",
+    "name": "hangup",
+    "label": "Hang up",
     "type": "button",
     "category": "non-data"
   },
   {
-    "name": "hangup",
-    "label": "Hang up",
+    "name": "soft",
+    "label": "Soft",
     "type": "button",
     "category": "non-data"
   },
   {
-    "name": "wrongnumber",
-    "label": "Wrong Number",
+    "name": "hard",
+    "label": "Hard",
     "type": "button",
     "category": "non-data"
   },
   {
-    "name": "abusive",
-    "label": "Abusive",
+    "name": "connecting",
+    "label": "Connecting",
     "type": "button",
     "category": "non-data"
   }
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json
index b2fa532e6c..179d80d17b 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json
@@ -3,9 +3,10 @@
     "callerInformation": {
     },
     "childInformation": {
+      "splitFormAt": 12
     },
     "caseInformation": {
-      "splitFormAt": 8
+      "splitFormAt": 12
     }
   },
   "case": {
@@ -43,10 +44,10 @@
       },
       "dutyOfCare": {
          "previewFields": [
-           "date",
-           "location"
+           "assessmentOfRisk",
+           "followUpRequired"
          ],
-         "splitFormAt": 2,
+         "splitFormAt": 8,
          "printOrder": 3,
          "caseHomeLocation": "timeline"
        },
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateKeys.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateKeys.json
new file mode 100644
index 0000000000..05b8475ff2
--- /dev/null
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateKeys.json
@@ -0,0 +1,9 @@
+{
+  "survey":{
+    "ChildInformationTab":["age", "gender"],
+    "CallerInformationTab":[]
+  },
+  "preEngagement":{
+    "ChildInformationTab":["firstName", "ethnicity1", "firstContact"]
+  }
+}
\ No newline at end of file
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateMappings.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateMappings.json
new file mode 100644
index 0000000000..7f27f4f621
--- /dev/null
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateMappings.json
@@ -0,0 +1,22 @@
+{
+  "formSelector": {
+    "selectorType": "serviceUserChoiceSelector",
+    "parameter": [{
+      "form": "preEngagement",
+      "input": "myselfOrOther",
+      "aboutSelfValue": "myself"
+    }, {
+      "form": "survey",
+      "input": "aboutSelf"
+    }]
+  },
+  "survey":{
+    "age": "ChildInformationTab.age",
+    "gender": "ChildInformationTab.gender"
+  },
+  "preEngagement":{
+    "firstName": "ChildInformationTab.firstName",
+    "ethnicity1": "ChildInformationTab.ethnicity1",
+    "firstContact": "ChildInformationTab.firstContact"
+  }
+}
\ No newline at end of file
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json
index 7a12c6df72..f45680925c 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json
@@ -1,101 +1,180 @@
 [
   {
-    "name": "date",
-    "label": "Date",
-    "type": "date-input",
-    "required": {
-      "value": true,
-      "message": "RequiredFieldError"
-    }
+    "name": "otherInformationAboutTheClient",
+    "label": "Other Information about the Client",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
   },
   {
-    "name": "duration",
-    "label": "Duration",
+    "name": "clientPresentation",
+    "label": "Client presentation",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
+  },
+  {
+    "name": "assessmentOfRisk",
+    "label": "Assessment of Risk",
     "type": "select",
+    "isPII": false,
     "options": [
       {
-        "value": "",
+        "value": "Unknown",
         "label": ""
       },
       {
-        "value": "Ongoing",
-        "label": "Ongoing"
+        "value": "Urgent",
+        "label": "Urgent"
+      },
+      {
+        "value": "High",
+        "label": "High"
       },
       {
-        "value": "Once Off",
-        "label": "Once Off"
+        "value": "Medium",
+        "label": "Medium"
       },
       {
-        "value": "Other",
-        "label": "Other"
+        "value": "Low",
+        "label": "Low"
       }
-    ],
-    "required": {
-      "value": true,
-      "message": "RequiredFieldError"
-    }
+    ]
+  },
+  {
+    "name": "supervisorsAnalysis",
+    "label": "Supervisor's Analysis",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
+  },
+  {
+    "name": "planOfAction",
+    "label": "Plan of Action",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
   },
   {
-    "name": "location",
-    "label": "Location",
+    "name": "immediateOutcome",
+    "label": "Immediate outcome (from Duty of Care process)",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
+  },
+  {
+    "name": "consultationDetails",
+    "label": "Barnardos Consultation - Date, Time and who consulted",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
+  },
+  {
+    "name": "agenciesInvolved",
+    "label": "Agencies Involved",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
+  },
+  {
+    "name": "informedUnitManager",
+    "label": "Informed unit manager?",
     "type": "select",
+    "isPII": false,
     "options": [
-      {
-        "value": "",
-        "label": ""
-      },
       {
         "value": "Unknown",
-        "label": "Unknown"
+        "label": ""
       },
       {
-        "value": "School",
-        "label": "School"
+        "value": "Yes",
+        "label": "Yes"
       },
       {
-        "value": "Home",
-        "label": "Home"
-      },
+        "value": "No",
+        "label": "No"
+      }
+    ]
+  },
+  {
+    "name": "whyNot",
+    "label": "If no, why not?",
+    "type": "input",
+    "isPII": false
+  },
+  {
+    "name": "methodOfInforming",
+    "label": "Method of informing",
+    "type": "listbox-multiselect",
+    "isPII": false,
+    "options": [
       {
-        "value": "Institution",
-        "label": "Institution"
+        "value": "Conversation",
+        "label": "Conversation"
       },
       {
-        "value": "Online",
-        "label": "Online"
+        "value": "Email",
+        "label": "Email"
       },
       {
-        "value": "Public Place",
-        "label": "Public Place"
+        "value": "Instant Message",
+        "label": "Instant Message"
       },
       {
-        "value": "Other",
-        "label": "Other"
+        "value": "Phone Call",
+        "label": "Phone Call"
       }
-    ],
-    "required": {
-      "value": true,
-      "message": "RequiredFieldError"
-    }
+    ]
   },
   {
-    "name": "isCaregiverAware",
-    "label": "Is caregiver aware?",
-    "type": "mixed-checkbox"
+    "name": "furtherActionNeeded",
+    "label": "Further action needed",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
   },
   {
-    "name": "incidentWitnessed",
-    "label": "Was the incident witnessed by anyone?",
-    "type": "mixed-checkbox"
+    "name": "followUpRequired",
+    "label": "This D.O.C requires further follow up",
+    "type": "select",
+    "isPII": false,
+    "options": [
+      {
+        "value": "Unknown",
+        "label": ""
+      },
+      {
+        "value": "Yes",
+        "label": "Yes"
+      },
+      {
+        "value": "No",
+        "label": "No"
+      }
+    ]
   },
   {
-    "name": "abuseReportedElsewhere",
-    "label": "Has abuse been reported elsewhere?",
-    "type": "mixed-checkbox"
+    "name": "notesFromFollowupAction",
+    "label": "Notes from follow-up action",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
   },
   {
-    "name": "whereElseBeenReported",
-    "label": "Where else the incident has been reported?",
-    "type": "mixed-checkbox"
+    "name": "furtherContactWithClientOrAgency",
+    "label": "Further contact with client or agency",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 7,
+    "width": 250
   }
 ]
\ No newline at end of file
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CallerInformationTab.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CallerInformationTab.json
index 1ec7a1fb6a..454dffb8b0 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CallerInformationTab.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CallerInformationTab.json
@@ -467,10 +467,6 @@
         "value": "Taupo district",
         "label": "Taupo district"
       },
-      {
-        "value": "Unknown",
-        "label": "Unknown"
-      },
       {
         "value": "Hauraki district",
         "label": "Hauraki district"
@@ -550,6 +546,10 @@
       {
         "value": "Wanganui district",
         "label": "Wanganui district"
+      },
+      {
+        "value": "Unknown",
+        "label": "Unknown"
       }
     ]
   },
@@ -1040,10 +1040,6 @@
         "value": "New Zealand European",
         "label": "New Zealand European"
       },
-      {
-        "value": "New Zealand European",
-        "label": "New Zealand European"
-      },
       {
         "value": "British and Irish",
         "label": "British and Irish"
@@ -1244,10 +1240,6 @@
         "value": "New Zealand European",
         "label": "New Zealand European"
       },
-      {
-        "value": "New Zealand European",
-        "label": "New Zealand European"
-      },
       {
         "value": "British and Irish",
         "label": "British and Irish"
@@ -1429,10 +1421,6 @@
   {
     "name": "phone1",
     "label": "Phone",
-    "type": "input",
-    "required": {
-      "value": true,
-      "message": "RequiredFieldError"
-    }
+    "type": "input"
   }
 ]
\ No newline at end of file
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json
index e70df9dfa6..692094b0b2 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json
@@ -1,4 +1,155 @@
 [
+  {
+    "name": "theme",
+    "label": "Risk Theme",
+    "type": "select",
+    "isPII": false,
+    "defaultOption": {
+      "value": "Unknown",
+      "label": ""
+    },
+    "options": [
+      {
+        "value": "Unknown",
+        "label": ""
+      },
+      {
+        "value": "Violence",
+        "label": "Violence"
+      },
+      {
+        "value": "Self-harming behaviour",
+        "label": "Self-harming behaviour"
+      },
+      {
+        "value": "Suicide",
+        "label": "Suicide"
+      }
+    ]
+  },
+  {
+    "name": "severity",
+    "label": "Risk Theme Severity",
+    "type": "dependent-select",
+    "isPII": false,
+    "dependsOn": "theme",
+    "defaultOption": {
+      "value": "Unknown",
+      "label": ""
+    },
+    "options": {
+      "Violence": [
+        {
+          "value": "1. Concern for other ",
+          "label": "1. Concern for other "
+        },
+        {
+          "value": "2. Seeking information ",
+          "label": "2. Seeking information "
+        },
+        {
+          "value": "3. Historic",
+          "label": "3. Historic"
+        },
+        {
+          "value": "4. Isolated incident",
+          "label": "4. Isolated incident"
+        },
+        {
+          "value": "5. Occasional violence",
+          "label": "5. Occasional violence"
+        },
+        {
+          "value": "6. Regular violence",
+          "label": "6. Regular violence"
+        },
+        {
+          "value": "7. Severe distress/harm",
+          "label": "7. Severe distress/harm"
+        },
+        {
+          "value": "8. Other",
+          "label": "8. Other"
+        },
+        {
+          "value": "9. Unknown",
+          "label": "9. Unknown"
+        }
+      ],
+      "Self-harming behaviour": [
+        {
+          "value": "1. Concern for other",
+          "label": "1. Concern for other"
+        },
+        {
+          "value": "2. Seeking info/thinking about SH",
+          "label": "2. Seeking info/thinking about SH"
+        },
+        {
+          "value": "3. Contacted WU to reduce current urge",
+          "label": "3. Contacted WU to reduce current urge"
+        },
+        {
+          "value": "4. Isolated incident ",
+          "label": "4. Isolated incident "
+        },
+        {
+          "value": "5. Occasional",
+          "label": "5. Occasional"
+        },
+        {
+          "value": "6. Frequent but not severe",
+          "label": "6. Frequent but not severe"
+        },
+        {
+          "value": "7. Chronic/severe ",
+          "label": "7. Chronic/severe "
+        },
+        {
+          "value": "8. Other ",
+          "label": "8. Other "
+        },
+        {
+          "value": "9. Unknown",
+          "label": "9. Unknown"
+        }
+      ],
+      "Suicide": [
+        {
+          "value": "1. Concern for other ",
+          "label": "1. Concern for other "
+        },
+        {
+          "value": "2. Seeking information ",
+          "label": "2. Seeking information "
+        },
+        {
+          "value": "3. Suicidal thoughts or fears ",
+          "label": "3. Suicidal thoughts or fears "
+        },
+        {
+          "value": "4. Chronic Suicidal thoughts or fears",
+          "label": "4. Chronic Suicidal thoughts or fears"
+        },
+        {
+          "value": "5. Immediate intention ",
+          "label": "5. Immediate intention "
+        },
+        {
+          "value": "6. Current attempt ",
+          "label": "6. Current attempt "
+        },
+        {
+          "value": "7. Recent/Frequent attempts",
+          "label": "7. Recent/Frequent attempts"
+        },
+        {
+          "value": "8. Other",
+          "label": "8. Other"
+        }
+      ]
+    }
+  },
   {
     "name": "otherActions",
     "label": "Other Actions",
@@ -111,14 +262,6 @@
       }
     ]
   },
-  {
-    "name": "contactSummary",
-    "label": "Contact Summary",
-    "type": "textarea",
-    "isPII": false,
-    "rows": 8,
-    "width": 250
-  },
   {
     "name": "overallOutcome",
     "label": "From your perspective, what was the overall outcome?",
@@ -234,7 +377,7 @@
     "label": "Background",
     "type": "textarea",
     "isPII": false,
-    "rows": 8,
+    "rows": 5,
     "width": 250
   },
   {
@@ -242,7 +385,7 @@
     "label": "Presentation",
     "type": "textarea",
     "isPII": false,
-    "rows": 8,
+    "rows": 5,
     "width": 250
   },
   {
@@ -250,7 +393,7 @@
     "label": "Formulation",
     "type": "textarea",
     "isPII": false,
-    "rows": 8,
+    "rows": 5,
     "width": 250
   },
   {
@@ -258,7 +401,7 @@
     "label": "Goals Identified",
     "type": "textarea",
     "isPII": false,
-    "rows": 8,
+    "rows": 5,
     "width": 250
   },
   {
@@ -266,7 +409,7 @@
     "label": "Actions or Outcomes",
     "type": "textarea",
     "isPII": false,
-    "rows": 8,
+    "rows": 5,
     "width": 250
   },
   {
@@ -274,7 +417,189 @@
     "label": "Other",
     "type": "textarea",
     "isPII": false,
-    "rows": 8,
+    "rows": 5,
+    "width": 250,
+    "description": {
+      "title": "Duty of Care",
+      "content": "The below fields need to be capture if there is a Duty of Care case"
+    }
+  },
+  {
+    "name": "otherInformationAboutTheClient",
+    "label": "Other Information about the Client",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "clientPresentation",
+    "label": "Client presentation",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "assessmentOfRisk",
+    "label": "Assessment of Risk",
+    "type": "select",
+    "isPII": false,
+    "options": [
+      {
+        "value": "Unknown",
+        "label": ""
+      },
+      {
+        "value": "Urgent",
+        "label": "Urgent"
+      },
+      {
+        "value": "High",
+        "label": "High"
+      },
+      {
+        "value": "Medium",
+        "label": "Medium"
+      },
+      {
+        "value": "Low",
+        "label": "Low"
+      }
+    ]
+  },
+  {
+    "name": "supervisorsAnalysis",
+    "label": "Supervisor's Analysis",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "planOfAction",
+    "label": "Plan of Action",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "immediateOutcome",
+    "label": "Immediate outcome (from Duty of Care process)",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "consultationDetails",
+    "label": "Barnardos Consultation - Date, Time and who consulted",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "agenciesInvolved",
+    "label": "Agencies Involved",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "informedUnitManager",
+    "label": "Informed unit manager?",
+    "type": "select",
+    "isPII": false,
+    "options": [
+      {
+        "value": "Unknown",
+        "label": ""
+      },
+      {
+        "value": "Yes",
+        "label": "Yes"
+      },
+      {
+        "value": "No",
+        "label": "No"
+      }
+    ]
+  },
+  {
+    "name": "whyNot",
+    "label": "Why not?",
+    "type": "input",
+    "isPII": false
+  },
+  {
+    "name": "methodOfInforming",
+    "label": "Method of informing",
+    "type": "listbox-multiselect",
+    "isPII": false,
+    "options": [
+      {
+        "value": "Conversation",
+        "label": "Conversation"
+      },
+      {
+        "value": "Email",
+        "label": "Email"
+      },
+      {
+        "value": "Instant Message",
+        "label": "Instant Message"
+      },
+      {
+        "value": "Phone Call",
+        "label": "Phone Call"
+      }
+    ]
+  },
+  {
+    "name": "furtherActionNeeded",
+    "label": "Further action needed",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "followUpRequired",
+    "label": "This D.O.C requires further follow up",
+    "type": "select",
+    "isPII": false,
+    "options": [
+      {
+        "value": "Unknown",
+        "label": ""
+      },
+      {
+        "value": "Yes",
+        "label": "Yes"
+      },
+      {
+        "value": "No",
+        "label": "No"
+      }
+    ]
+  },
+  {
+    "name": "notesFromFollowupAction",
+    "label": "Notes from follow-up action",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "furtherContactWithClientOrAgency",
+    "label": "Further contact with client or agency",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
     "width": 250
   }
 ]
\ No newline at end of file
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/ChildInformationTab.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/ChildInformationTab.json
index 1d6733b286..8ed054868f 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/ChildInformationTab.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/ChildInformationTab.json
@@ -201,10 +201,6 @@
         "value": "New Zealand European",
         "label": "New Zealand European"
       },
-      {
-        "value": "New Zealand European",
-        "label": "New Zealand European"
-      },
       {
         "value": "British and Irish",
         "label": "British and Irish"
@@ -405,10 +401,6 @@
         "value": "New Zealand European",
         "label": "New Zealand European"
       },
-      {
-        "value": "New Zealand European",
-        "label": "New Zealand European"
-      },
       {
         "value": "British and Irish",
         "label": "British and Irish"
@@ -593,6 +585,78 @@
     "type": "input",
     "isPII": false
   },
+  {
+    "name": "city",
+    "label": "City",
+    "type": "select",
+    "isPII": false,
+    "options": [
+      {
+        "value": "Unknown",
+        "label": ""
+      },
+      {
+        "value": "Auckland",
+        "label": "Auckland"
+      },
+      {
+        "value": "Wellington",
+        "label": "Wellington"
+      },
+      {
+        "value": "Christchurch",
+        "label": "Christchurch"
+      },
+      {
+        "value": "Hamilton",
+        "label": "Hamilton"
+      },
+      {
+        "value": "Napier-Hastings",
+        "label": "Napier-Hastings"
+      },
+      {
+        "value": "Tauranga",
+        "label": "Tauranga"
+      },
+      {
+        "value": "Dunedin",
+        "label": "Dunedin"
+      },
+      {
+        "value": "Palmerston North",
+        "label": "Palmerston North"
+      },
+      {
+        "value": "Nelson",
+        "label": "Nelson"
+      },
+      {
+        "value": "Rotorua",
+        "label": "Rotorua"
+      },
+      {
+        "value": "New Plymouth",
+        "label": "New Plymouth"
+      },
+      {
+        "value": "Whangārei",
+        "label": "Whangārei"
+      },
+      {
+        "value": "Invercargill",
+        "label": "Invercargill"
+      },
+      {
+        "value": "Whanganui",
+        "label": "Whanganui"
+      },
+      {
+        "value": "Gisborne",
+        "label": "Gisborne"
+      }
+    ]
+  },
   {
     "name": "district",
     "label": "District",
@@ -827,10 +891,6 @@
         "value": "Taupo district",
         "label": "Taupo district"
       },
-      {
-        "value": "Unknown",
-        "label": "Unknown"
-      },
       {
         "value": "Hauraki district",
         "label": "Hauraki district"
@@ -910,8 +970,16 @@
       {
         "value": "Wanganui district",
         "label": "Wanganui district"
+      },
+      {
+        "value": "Unknown",
+        "label": "Unknown"
       }
-    ]
+    ],
+    "required": {
+      "value": true,
+      "message": "RequiredFieldError"
+    }
   },
   {
     "name": "region",
@@ -1380,80 +1448,12 @@
           "label": "Whanganui"
         }
       ]
+    },
+    "required": {
+      "value": true,
+      "message": "RequiredFieldError"
     }
   },
-  {
-    "name": "city",
-    "label": "City",
-    "type": "select",
-    "isPII": false,
-    "options": [
-      {
-        "value": "Unknown",
-        "label": ""
-      },
-      {
-        "value": "Auckland",
-        "label": "Auckland"
-      },
-      {
-        "value": "Wellington",
-        "label": "Wellington"
-      },
-      {
-        "value": "Christchurch",
-        "label": "Christchurch"
-      },
-      {
-        "value": "Hamilton",
-        "label": "Hamilton"
-      },
-      {
-        "value": "Napier-Hastings",
-        "label": "Napier-Hastings"
-      },
-      {
-        "value": "Tauranga",
-        "label": "Tauranga"
-      },
-      {
-        "value": "Dunedin",
-        "label": "Dunedin"
-      },
-      {
-        "value": "Palmerston North",
-        "label": "Palmerston North"
-      },
-      {
-        "value": "Nelson",
-        "label": "Nelson"
-      },
-      {
-        "value": "Rotorua",
-        "label": "Rotorua"
-      },
-      {
-        "value": "New Plymouth",
-        "label": "New Plymouth"
-      },
-      {
-        "value": "Whangārei",
-        "label": "Whangārei"
-      },
-      {
-        "value": "Invercargill",
-        "label": "Invercargill"
-      },
-      {
-        "value": "Whanganui",
-        "label": "Whanganui"
-      },
-      {
-        "value": "Gisborne",
-        "label": "Gisborne"
-      }
-    ]
-  },
   {
     "name": "personalEmail",
     "label": "Personal Email",
diff --git a/webchat/configurations/nzba-staging.ts b/webchat/configurations/nzba-staging.ts
index 06c772b6b6..14006a980a 100644
--- a/webchat/configurations/nzba-staging.ts
+++ b/webchat/configurations/nzba-staging.ts
@@ -48,17 +48,215 @@ const preEngagementConfig: PreEngagementFormDefinition = {
       required: true,
     },
     {
-      label: 'How urgent is your situation?',
+      name: "ethnicity1",
+      label: "Ethnicity",
+      type: "select",
+      isPII: false,
+      options: [
+        {
+          value: "",
+          label: ""
+        },
+        {
+          value: "European (Unspecified)",
+          label: "European (Unspecified)"
+        },
+        {
+          value: "New Zealand European",
+          label: "New Zealand European"
+        },
+        {
+          value: "British and Irish",
+          label: "British and Irish"
+        },
+        {
+          value: "Dutch",
+          label: "Dutch"
+        },
+        {
+          value: "Greek",
+          label: "Greek"
+        },
+        {
+          value: "Polish",
+          label: "Polish"
+        },
+        {
+          value: "South Slav",
+          label: "South Slav"
+        },
+        {
+          value: "Italian",
+          label: "Italian"
+        },
+        {
+          value: "German",
+          label: "German"
+        },
+        {
+          value: "Australian",
+          label: "Australian"
+        },
+        {
+          value: "Other European",
+          label: "Other European"
+        },
+        {
+          value: "Māori",
+          label: "Māori"
+        },
+        {
+          value: "Pacific Peoples (unspecified)",
+          label: "Pacific Peoples (unspecified)"
+        },
+        {
+          value: "Samoan",
+          label: "Samoan"
+        },
+        {
+          value: "Cook Islands Maori",
+          label: "Cook Islands Maori"
+        },
+        {
+          value: "Tongan",
+          label: "Tongan"
+        },
+        {
+          value: "Niuean",
+          label: "Niuean"
+        },
+        {
+          value: "Tokelauan",
+          label: "Tokelauan"
+        },
+        {
+          value: "Fijian",
+          label: "Fijian"
+        },
+        {
+          value: "French Polynesian",
+          label: "French Polynesian"
+        },
+        {
+          value: "Indigenous Australian",
+          label: "Indigenous Australian"
+        },
+        {
+          value: "Kiribati",
+          label: "Kiribati"
+        },
+        {
+          value: "Micronesian",
+          label: "Micronesian"
+        },
+        {
+          value: "Papua New Guinea",
+          label: "Papua New Guinea"
+        },
+        {
+          value: "Solomon Islander",
+          label: "Solomon Islander"
+        },
+        {
+          value: "Tuvalu Islander",
+          label: "Tuvalu Islander"
+        },
+        {
+          value: "Other Pacific Peoples",
+          label: "Other Pacific Peoples"
+        },
+        {
+          value: "Asian (unspecified)",
+          label: "Asian (unspecified)"
+        },
+        {
+          value: "Southeast Asian (unspecified)",
+          label: "Southeast Asian (unspecified)"
+        },
+        {
+          value: "Filipino",
+          label: "Filipino"
+        },
+        {
+          value: "Cambodian",
+          label: "Cambodian"
+        },
+        {
+          value: "Vietnamese",
+          label: "Vietnamese"
+        },
+        {
+          value: "Other Southeast Asian",
+          label: "Other Southeast Asian"
+        },
+        {
+          value: "Chinese",
+          label: "Chinese"
+        },
+        {
+          value: "Indian",
+          label: "Indian"
+        },
+        {
+          value: "Sri Lankan",
+          label: "Sri Lankan"
+        },
+        {
+          value: "Japanese",
+          label: "Japanese"
+        },
+        {
+          value: "Korean",
+          label: "Korean"
+        },
+        {
+          value: "Other Asian",
+          label: "Other Asian"
+        },
+        {
+          value: "Middle Eastern",
+          label: "Middle Eastern"
+        },
+        {
+          value: "Latin American",
+          label: "Latin American"
+        },
+        {
+          value: "African",
+          label: "African"
+        },
+        {
+          value: "Indian Ocean Peoples",
+          label: "Indian Ocean Peoples"
+        },
+        {
+          value: "Indigenous American",
+          label: "Indigenous American"
+        },
+        {
+          value: "Other Ethnicity",
+          label: "Other Ethnicity"
+        },
+        {
+          value: "Not Stated",
+          label: "Not Stated"
+        }
+      ],
+      required: {
+        value: true,
+        message: "RequiredFieldError"
+      }
+    },
+    {
+      label: 'Is this your first contact?',
       type: 'select',
-      name: 'urgencyLevel',
+      name: 'firstContact',
       required: false,
       defaultValue: '',
       options: [
-        { 'value': '', 'label': '' },
-        { 'value': 'Urgent', 'label': 'Urgent' },
-        { 'value': 'Critical', 'label': 'Critical' },
-        { 'value': 'Non-critical', 'label': 'Non-critical' },
-        { 'value': 'Other', 'label': 'Other' }
+        { value: '', label: '' },
+        { value: 'Yes', label: 'Yes' },
+        { value: 'No', label: 'No' }
       ],
     },
     {
@@ -69,9 +267,9 @@ const preEngagementConfig: PreEngagementFormDefinition = {
       required: {
         value: true,
         message: "Sorry, if you don't accept our terms and conditions we can't provide counselling to you.",
-      }, 
+      },
     },
-   
+
   ],
 };