diff --git a/apps/api/prisma/migrations/20230925150249_extended_ems_fd_incidents/migration.sql b/apps/api/prisma/migrations/20230925150249_extended_ems_fd_incidents/migration.sql
new file mode 100644
index 000000000..d5b660ccc
--- /dev/null
+++ b/apps/api/prisma/migrations/20230925150249_extended_ems_fd_incidents/migration.sql
@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "EmsFdIncident" ADD COLUMN     "address" TEXT,
+ADD COLUMN     "fireType" TEXT,
+ADD COLUMN     "vehicleInvolved" BOOLEAN NOT NULL DEFAULT false;
diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma
index 7469980ef..3125ba0fb 100644
--- a/apps/api/prisma/schema.prisma
+++ b/apps/api/prisma/schema.prisma
@@ -1588,7 +1588,9 @@ model EmsFdIncident {
   caseNumber           Int                    @default(autoincrement())
   description          String?                @db.Text
   descriptionData      Json?
+  address              String?
   postal               String?
+  fireType             String?
   // when null, it is the dispatcher
   creator              EmsFdDeputy?           @relation("emsFdIncidentCreator", fields: [creatorId], references: [id])
   creatorId            String?
@@ -1596,6 +1598,7 @@ model EmsFdIncident {
   firearmsInvolved     Boolean                @default(false)
   injuriesOrFatalities Boolean                @default(false)
   arrestsMade          Boolean                @default(false)
+  vehicleInvolved      Boolean                @default(false)
   isActive             Boolean                @default(false)
   createdAt            DateTime               @default(now())
   updatedAt            DateTime               @default(now()) @updatedAt
diff --git a/apps/client/locales/en/leo.json b/apps/client/locales/en/leo.json
index bc07e903e..44fdc0087 100644
--- a/apps/client/locales/en/leo.json
+++ b/apps/client/locales/en/leo.json
@@ -344,7 +344,9 @@
     "ACTIVE_INCIDENTS": "Active Incidents",
     "layoutSavedTitle": "Layout Saved",
     "layoutSavedMessage": "Your layout has been saved.",
-    "editDashboardLayout": "Edit Dashboard Layout"
+    "editDashboardLayout": "Edit Dashboard Layout",
+    "vehicleInvolved": "Vehicle Involved",
+    "fireType": "Fire Type"
   },
   "Bolos": {
     "activeBolos": "Active Bolos",
diff --git a/apps/client/src/components/leo/incidents/manage-incident-modal.tsx b/apps/client/src/components/leo/incidents/manage-incident-modal.tsx
index 9cd8aec9e..0d80d5a3e 100644
--- a/apps/client/src/components/leo/incidents/manage-incident-modal.tsx
+++ b/apps/client/src/components/leo/incidents/manage-incident-modal.tsx
@@ -7,6 +7,7 @@ import {
   FormRow,
   Infofield,
   FullDate,
+  TextField,
 } from "@snailycad/ui";
 import { FormField } from "components/form/FormField";
 import { Modal } from "components/modal/Modal";
@@ -160,16 +161,20 @@ export function ManageIncidentModal<T extends LeoIncident | EmsFdIncident>({
   }
 
   const validate = handleValidate(LEO_INCIDENT_SCHEMA);
+  const isEmsFdIncident = incident && "fireType" in incident;
+
   const INITIAL_VALUES = {
     description: incident?.description ?? "",
     postal: incident?.postal ?? "",
     descriptionData: dataToSlate(incident),
+    vehicleInvolved: isEmsFdIncident ? incident.vehicleInvolved : false,
     firearmsInvolved: incident?.firearmsInvolved ?? false,
     injuriesOrFatalities: incident?.injuriesOrFatalities ?? false,
     arrestsMade: incident?.arrestsMade ?? false,
     isActive: isDispatch ? true : incident?.isActive ?? false,
     situationCodeId: incident?.situationCodeId ?? null,
     openModalAfterCreation: true,
+    fireType: isEmsFdIncident ? incident.fireType ?? "" : "",
   };
 
   return (
@@ -205,7 +210,12 @@ export function ManageIncidentModal<T extends LeoIncident | EmsFdIncident>({
               ) : null}
 
               <div>
-                <FormRow className="mb-3" useFlex>
+                <div
+                  className={classNames(
+                    "grid mb-3",
+                    type === "ems-fd" ? "grid-cols-2" : "grid-cols-3",
+                  )}
+                >
                   <SwitchField
                     isDisabled={areFieldsDisabled}
                     isSelected={values.firearmsInvolved}
@@ -232,7 +242,16 @@ export function ManageIncidentModal<T extends LeoIncident | EmsFdIncident>({
                   >
                     {t("arrestsMade")}
                   </SwitchField>
-                </FormRow>
+
+                  <SwitchField
+                    isDisabled={areFieldsDisabled}
+                    isSelected={values.vehicleInvolved}
+                    onChange={(isSelected) => setFieldValue("vehicleInvolved", isSelected)}
+                    className="w-full"
+                  >
+                    {t("vehicleInvolved")}
+                  </SwitchField>
+                </div>
 
                 <FormField errorMessage={errors.description} label={common("description")}>
                   <Editor
@@ -242,22 +261,33 @@ export function ManageIncidentModal<T extends LeoIncident | EmsFdIncident>({
                   />
                 </FormField>
 
-                <FormRow useFlex>
-                  <ValueSelectField
-                    className="w-full"
-                    isOptional
-                    isDisabled={areFieldsDisabled}
-                    isClearable
-                    label={t("situationCode")}
-                    fieldName="situationCodeId"
-                    values={codes10.values}
-                    valueType={ValueType.CODES_10}
-                    filterFn={(value) => value.type === StatusValueType.SITUATION_CODE}
-                  />
+                <FormRow useFlex className={classNames(type === "ems-fd" && "!flex-col")}>
+                  <FormRow useFlex className={classNames(type === "leo" && "!flex-col")}>
+                    <ValueSelectField
+                      className="w-full"
+                      isOptional
+                      isDisabled={areFieldsDisabled}
+                      isClearable
+                      label={t("situationCode")}
+                      fieldName="situationCodeId"
+                      values={codes10.values}
+                      valueType={ValueType.CODES_10}
+                      filterFn={(value) => value.type === StatusValueType.SITUATION_CODE}
+                    />
+
+                    <TextField
+                      isOptional
+                      value={values.fireType}
+                      className="w-full"
+                      onChange={(value) => setFieldValue("fireType", value)}
+                      label={t("fireType")}
+                    />
+                  </FormRow>
 
                   <AddressPostalSelect
+                    addressOptional
                     isDisabled={areFieldsDisabled}
-                    postalOnly
+                    postalOnly={type === "leo"}
                     addressLabel="location"
                   />
                 </FormRow>