diff --git a/client/src/pages/vehicles.tsx b/client/src/pages/vehicles.tsx
index baa6071..26dc322 100644
--- a/client/src/pages/vehicles.tsx
+++ b/client/src/pages/vehicles.tsx
@@ -109,6 +109,7 @@ export default function Vehicles() {
       brand: "",
       model: "",
       vehicleType: "car",
+      location: "roccapiemonte",
       year: undefined,
       assignedGuardId: null,
       status: "available",
@@ -213,6 +214,7 @@ export default function Vehicles() {
       brand: vehicle.brand,
       model: vehicle.model,
       vehicleType: vehicle.vehicleType,
+      location: vehicle.location,
       year: vehicle.year ?? undefined,
       assignedGuardId: vehicle.assignedGuardId,
       status: vehicle.status,
@@ -370,7 +372,7 @@ export default function Vehicles() {
           </DialogHeader>
           <Form {...createForm}>
             <form onSubmit={createForm.handleSubmit((data) => createVehicleMutation.mutate(data))} className="space-y-4">
-              <div className="grid grid-cols-2 gap-4">
+              <div className="grid grid-cols-3 gap-4">
                 <FormField
                   control={createForm.control}
                   name="licensePlate"
@@ -384,6 +386,28 @@ export default function Vehicles() {
                     </FormItem>
                   )}
                 />
+                <FormField
+                  control={createForm.control}
+                  name="location"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Sede *</FormLabel>
+                      <Select onValueChange={field.onChange} value={field.value} data-testid="select-create-location">
+                        <FormControl>
+                          <SelectTrigger>
+                            <SelectValue placeholder="Seleziona sede" />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent>
+                          <SelectItem value="roccapiemonte">Roccapiemonte</SelectItem>
+                          <SelectItem value="milano">Milano</SelectItem>
+                          <SelectItem value="roma">Roma</SelectItem>
+                        </SelectContent>
+                      </Select>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
                 <FormField
                   control={createForm.control}
                   name="vehicleType"
@@ -575,7 +599,7 @@ export default function Vehicles() {
           </DialogHeader>
           <Form {...editForm}>
             <form onSubmit={editForm.handleSubmit((data) => selectedVehicle && updateVehicleMutation.mutate({ id: selectedVehicle.id, data }))} className="space-y-4">
-              <div className="grid grid-cols-2 gap-4">
+              <div className="grid grid-cols-3 gap-4">
                 <FormField
                   control={editForm.control}
                   name="licensePlate"
@@ -589,6 +613,28 @@ export default function Vehicles() {
                     </FormItem>
                   )}
                 />
+                <FormField
+                  control={editForm.control}
+                  name="location"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Sede *</FormLabel>
+                      <Select onValueChange={field.onChange} value={field.value} data-testid="select-edit-location">
+                        <FormControl>
+                          <SelectTrigger>
+                            <SelectValue placeholder="Seleziona sede" />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent>
+                          <SelectItem value="roccapiemonte">Roccapiemonte</SelectItem>
+                          <SelectItem value="milano">Milano</SelectItem>
+                          <SelectItem value="roma">Roma</SelectItem>
+                        </SelectContent>
+                      </Select>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
                 <FormField
                   control={editForm.control}
                   name="vehicleType"