diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/CallTypeButtons.json b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/CallTypeButtons.json
index d710019543..1375b40f94 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/CallTypeButtons.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/CallTypeButtons.json
@@ -17,12 +17,6 @@
         "type": "button",
         "category": "non-data"
     },
-    {
-        "name": "VAWIE",
-        "label": "VAWIE",
-        "type": "button",
-        "category": "non-data"
-    },
     {
         "name": "blank",
         "label": "Blank",
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/IncidentForm.json b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/IncidentForm.json
index d1239f504b..43a7293e34 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/IncidentForm.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/IncidentForm.json
@@ -111,6 +111,44 @@
     "type": "checkbox",
     "isPII": false
   },
+  {
+    "name": "electoralActor",
+    "label": "Electoral Actor",
+    "type": "select",
+    "options": [
+    {
+      "label": "Voter/Individual"
+    },
+    {
+      "label": "Candidate/Aspiring candidate"
+    },
+    {
+      "label": "Party activist/Member"
+    },
+    {
+      "label": "Party agent/Pollwatcher"
+    },
+    {
+      "label": "Nonpartisan election observer"
+    },
+    {
+      "label": "CSO Rep"
+    },
+    {
+      "label": "Security Agent"
+    },
+    {
+      "label": "Media"
+    },
+    {
+      "label": "Family/Community"
+    },
+    {
+      "label": "Election worker/official"
+    }
+  ],
+  "isPII":false
+  },
   {
     "name": "locationElectionIncident",
     "label": "Location of the incident in Relation to Politics/Elections",
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/PerpetratorForm.json b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/PerpetratorForm.json
index f9cf973485..627688ee9d 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/PerpetratorForm.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/PerpetratorForm.json
@@ -1017,7 +1017,7 @@
     "options": [
       {
         "value": "Unknown",
-        "label": ""
+        "label": "Unknown"
       },
       {
         "value": "partyMember",
@@ -1091,5 +1091,14 @@
     "label": "Ethnicity",
     "type": "input",
     "isPII": true
+  },
+  {
+    "name": "vawieComments",
+    "label": "VAWIE Notes",
+    "type": "textarea",
+    "placeholder": "",
+    "rows": 10,
+    "width": 100,
+    "isPII": false
   }
-]
\ No newline at end of file
+]
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/ReferralForm.json b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/ReferralForm.json
index c0cfb930ba..25cd5c5535 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/ReferralForm.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/ReferralForm.json
@@ -15,11 +15,11 @@
   {
     "name": "referredTo",
     "label": "Referred To",
-    "type": "select",
+    "type": "listbox-multiselect",
     "options": [
       {
-        "value": "",
-        "label": ""
+        "value": "Unknown",
+        "label": "Unknown"
       },
       {
         "value": "OSC",
@@ -57,6 +57,10 @@
         "value": "Chief/Head man",
         "label": "Chief/Head man"
       },
+      {
+        "value": "Legal aid",
+        "label": "Legal Aid"
+      },
       {
         "value": "Head teacher",
         "label": "Head teacher"
@@ -88,4 +92,4 @@
     "width": 300,
     "isPII": true
   }
-]
\ No newline at end of file
+]
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/IssueCategorizationTab.json b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/IssueCategorizationTab.json
index bef05d32c0..e0a7fbd34a 100644
--- a/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/IssueCategorizationTab.json
+++ b/lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/IssueCategorizationTab.json
@@ -51,9 +51,6 @@
           {
             "label": "Online Addiction"
           },
-          {
-            "label": "VAWIE"
-          },
           {
             "label": "Other Online Harm"
           }
@@ -147,9 +144,6 @@
           {
             "label": "Physical violence"
           },
-          {
-            "label": "Political related GBV"
-          },
           {
             "label": "Sexual violence"
           },
@@ -462,51 +456,22 @@
         "color": "#47BA5E",
         "subcategories": [
           {
-            "label": "Violence Experienced During Election"
-          },
-          {
-            "label": "VAWIE Confirmed GBV component"
-          },
-          {
-            "label": "VAWIE Possible GBV component"
-          },
-          {
-            "label": "Unspecified/Other"
-          }
-        ]
-      },
-      "VAWIE Electoral Actor": {
-        "color": "#472A5E",
-        "subcategories": [
-          {
-            "label": "Voter/Individual"
-          },
-          {
-            "label": "Candidate/Aspiring candidate"
-          },
-          {
-            "label": "Party activist/Member"
-          },
-          {
-            "label": "Party agent/Pollwatcher"
-          },
-          {
-            "label": "Nonpartisan election observer"
+            "label": "Physical"
           },
           {
-            "label": "CSO Rep"
+            "label": "Sexual"
           },
           {
-            "label": "Security Agent"
+            "label": "Psychological/Emotional"
           },
           {
-            "label": "Media"
+            "label": "Threats and Coercion"
           },
           {
-            "label": "Family/Community"
+            "label": "Economic"
           },
           {
-            "label": "Election worker/official"
+            "label": "Information seeking about VAWIE services"
           },
           {
             "label": "Unspecified/Other"
@@ -616,9 +581,6 @@
           {
             "label": "Hacking"
           },
-          {
-            "label": "VAWIE" 
-          },
           {
             "label": "Online Addiction"
           },
@@ -723,9 +685,6 @@
           {
             "label": "Physical violence"
           },
-          {
-            "label": "Political related GBV"
-          },
           {
             "label": "Sexual violence"
           },
@@ -919,51 +878,22 @@
         "color": "#47BA5E",
         "subcategories": [
           {
-            "label": "Violence Experienced During Election"
-          },
-          {
-            "label": "VAWIE Confirmed GBV component"
-          },
-          {
-            "label": "VAWIE Possible GBV component"
-          },
-          {
-            "label": "Unspecified/Other"
-          }
-        ]
-      },
-      "VAWIE Electoral Actor": {
-        "color": "#472A5E",
-        "subcategories": [
-          {
-            "label": "Voter/Individual"
-          },
-          {
-            "label": "Candidate/Aspiring candidate"
-          },
-          {
-            "label": "Party activist/Member"
-          },
-          {
-            "label": "Party agent/Pollwatcher"
-          },
-          {
-            "label": "Nonpartisan election observer"
+            "label": "Physical"
           },
           {
-            "label": "CSO Rep"
+            "label": "Sexual"
           },
           {
-            "label": "Security Agent"
+            "label": "Psychological/Emotional"
           },
           {
-            "label": "Media"
+            "label": "Threats and Coercion"
           },
           {
-            "label": "Family/Community"
+            "label": "Economic"
           },
           {
-            "label": "Election worker/official"
+            "label": "Information seeking about VAWIE services"
           },
           {
             "label": "Unspecified/Other"