diff --git a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
index 3fd798b08..0df6444c9 100644
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
@@ -12,6 +12,7 @@ import {
   Textarea,
   TextInput,
 } from "@mantine/core";
+import { DateInput } from "@mantine/dates";
 
 import { FLEET_SELECT_NONE, type FleetFormFieldDef } from "@/pages/fleet/config/resources";
 import type { FleetRecord } from "@/services/fleet/fleet.service";
@@ -131,6 +132,7 @@ const FleetFormDialog = ({
         <NumberInput
           key={field.name}
           label={field.label}
+          placeholder={field.placeholder}
           value={value === "" || value == null ? "" : Number(value)}
           onChange={(next) =>
             setValues((current) => ({
@@ -139,6 +141,7 @@ const FleetFormDialog = ({
             }))
           }
           error={error}
+          disabled={field.disabled}
         />
       );
     }
@@ -148,15 +151,35 @@ const FleetFormDialog = ({
         <Textarea
           key={field.name}
           label={field.label}
+          placeholder={field.placeholder}
           value={String(value ?? "")}
           onChange={(e) =>
-            setValues((current) => ({
-              ...current,
-              [field.name]: e.target?.value ?? "",
-            }))
+            setValues((current) => ({ ...current, [field.name]: e.currentTarget?.value }))
           }
           error={error}
           minRows={3}
+          disabled={field.disabled}
+        />
+      );
+    }
+
+    if (field.type === "date") {
+      return (
+        <DateInput
+          key={field.name}
+          label={field.label}
+          placeholder={field.placeholder}
+          value={value ? new Date(value as string) : null}
+          onChange={(date) =>
+            setValues((current) => ({
+              ...current,
+              [field.name]: date ? (date instanceof Date ? date.toISOString().split('T')[0] : date) : "",
+            }))
+          }
+          error={error}
+          disabled={field.disabled}
+          clearable
+          valueFormat="DD/MM/YYYY"
         />
       );
     }
@@ -165,14 +188,14 @@ const FleetFormDialog = ({
       <TextInput
         key={field.name}
         label={field.label}
+        placeholder={field.placeholder}
+        description={field.description}
         value={String(value ?? "")}
         onChange={(e) =>
-          setValues((current) => ({
-            ...current,
-            [field.name]: e.target?.value ?? "",
-          }))
+          setValues((current) => ({ ...current, [field.name]: e.currentTarget?.value }))
         }
         error={error}
+        disabled={field.disabled}
       />
     );
   };
@@ -204,4 +227,4 @@ const FleetFormDialog = ({
   );
 };
 
-export default FleetFormDialog;
+export default FleetFormDialog;
\ No newline at end of file