diff --git a/src/messages/helpFormMain.js b/src/messages/helpFormMain.js
index 4de37e30..8d705afe 100644
--- a/src/messages/helpFormMain.js
+++ b/src/messages/helpFormMain.js
@@ -45,7 +45,8 @@ function helpFormMainBlocks({ user, isAdvanced, errorMessage, helpRequest }) {
           optionBlock("Production"),
           optionBlock("Perftest / Test", "test"),
           optionBlock("ITHC"),
-          optionBlock("N/A", "none"),
+          optionBlock("Demo", "demo"),
+          optionBlock("Sandbox", "sbox"),
         ],
         action_id: "environment",
         // Arcane javascript alchemy to only provide initial_option if we have a value for it
@@ -70,35 +71,49 @@ function helpFormMainBlocks({ user, isAdvanced, errorMessage, helpRequest }) {
         },
         options: [
           optionBlock("Access Management", "am"),
+          optionBlock("Adoption"),
           optionBlock("Architecture"),
-          optionBlock("Bulk scan", "bulkscan"),
           optionBlock("Bulk print", "bulkprint"),
+          optionBlock("Bulk scan", "bulkscan"),
           optionBlock("CCD"),
-          optionBlock("Civil Unspecified", "CivilUnspec"),
+          optionBlock("Civil", "civil"),
           optionBlock("CMC"),
           optionBlock("Divorce"),
-          optionBlock("No fault divorce", "nfdivorce"),
+          optionBlock("Employment Tribunals", "et"),
           optionBlock("Ethos"),
-          optionBlock("Evidence Management", "evidence"),
+          optionBlock("Evidence Management", "em"),
           optionBlock("Expert UI", "xui"),
-          optionBlock("Financial Remedy", "finrem"),
-          optionBlock("FPLA"),
+          optionBlock("Family Integration Stream", "fis"),
           optionBlock("Family Private Law", "FPRL"),
+          optionBlock("Fees/Pay", "fees-pay"),
+          optionBlock("Financial Remedy", "finrem"),
+          optionBlock("Find a Court or Tribunal", "FACT"),
+          optionBlock("Future Hearings", "HMI"),
           optionBlock("Heritage"),
           optionBlock("HMI"),
-          optionBlock("Management Information", "mi"),
           optionBlock("IDAM"),
+          optionBlock("Immigration"),
+          optionBlock("Log and Audit", "LAU"),
+          optionBlock("Management Information", "mi"),
+          optionBlock("No fault divorce", "nfdiv"),
+          optionBlock("PayBubble"),
+          optionBlock("PDDA"),
+          optionBlock("PET"),
           optionBlock("Private Law", "private-law"),
+          optionBlock("Probate"),
           optionBlock("Reference Data", "refdata"),
           optionBlock(
             "Reform Software Engineering",
             "reform-software-engineering",
           ),
-          optionBlock("Security Operations or Secure design", "security"),
+          optionBlock("Residential Property", "rpts"),
+          optionBlock("Retain and Dispose", "disposer"),
+          optionBlock("Security Operations / Secure Design", "security"),
+          optionBlock("Special Tribunals", "sptribs"),
           optionBlock("SSCS"),
-          optionBlock("PayBubble"),
-          optionBlock("PET"),
-          optionBlock("Work Allocation", "workallocation"),
+          optionBlock("Tax Tribunals", "tax-tribunals"),
+          optionBlock("Video Hearings", "vh"),
+          optionBlock("Work Allocation", "wa"),
           optionBlock("Other"),
         ],
         action_id: "team",