diff --git a/client/src/pages/sites.tsx b/client/src/pages/sites.tsx
index de7d018..16d0566 100644
--- a/client/src/pages/sites.tsx
+++ b/client/src/pages/sites.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { useQuery, useMutation } from "@tanstack/react-query";
-import { Site, InsertSite, Customer } from "@shared/schema";
+import { Site, InsertSite, Customer, ServiceType } from "@shared/schema";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
@@ -18,13 +18,6 @@ import { StatusBadge } from "@/components/status-badge";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
 
-const shiftTypeLabels: Record<string, string> = {
-  fixed_post: "Presidio Fisso",
-  patrol: "Pattugliamento",
-  night_inspection: "Ispettorato Notturno",
-  quick_response: "Pronto Intervento",
-};
-
 const locationLabels: Record<string, string> = {
   roccapiemonte: "Roccapiemonte",
   milano: "Milano",
@@ -44,6 +37,10 @@ export default function Sites() {
     queryKey: ["/api/customers"],
   });
 
+  const { data: serviceTypes } = useQuery<ServiceType[]>({
+    queryKey: ["/api/service-types"],
+  });
+
   const form = useForm<InsertSite>({
     resolver: zodResolver(insertSiteSchema),
     defaultValues: {
@@ -51,7 +48,7 @@ export default function Sites() {
       address: "",
       customerId: undefined,
       location: "roccapiemonte",
-      shiftType: "fixed_post",
+      serviceTypeId: undefined,
       minGuards: 1,
       requiresArmed: false,
       requiresDriverLicense: false,
@@ -71,7 +68,7 @@ export default function Sites() {
       address: "",
       customerId: undefined,
       location: "roccapiemonte",
-      shiftType: "fixed_post",
+      serviceTypeId: undefined,
       minGuards: 1,
       requiresArmed: false,
       requiresDriverLicense: false,
@@ -145,7 +142,7 @@ export default function Sites() {
       address: site.address,
       customerId: site.customerId ?? undefined,
       location: site.location,
-      shiftType: site.shiftType,
+      serviceTypeId: site.serviceTypeId ?? undefined,
       minGuards: site.minGuards,
       requiresArmed: site.requiresArmed,
       requiresDriverLicense: site.requiresDriverLicense,
@@ -345,21 +342,22 @@ export default function Sites() {
 
                 <FormField
                   control={form.control}
-                  name="shiftType"
+                  name="serviceTypeId"
                   render={({ field }) => (
                     <FormItem>
-                      <FormLabel>Tipologia Servizio</FormLabel>
+                      <FormLabel>Tipologia Servizio (opzionale)</FormLabel>
                       <Select onValueChange={field.onChange} value={field.value ?? undefined}>
                         <FormControl>
-                          <SelectTrigger data-testid="select-shift-type">
+                          <SelectTrigger data-testid="select-service-type">
                             <SelectValue placeholder="Seleziona tipo servizio" />
                           </SelectTrigger>
                         </FormControl>
                         <SelectContent>
-                          <SelectItem value="fixed_post">Presidio Fisso</SelectItem>
-                          <SelectItem value="patrol">Pattugliamento</SelectItem>
-                          <SelectItem value="night_inspection">Ispettorato Notturno</SelectItem>
-                          <SelectItem value="quick_response">Pronto Intervento</SelectItem>
+                          {serviceTypes?.filter(st => st.isActive).map((serviceType) => (
+                            <SelectItem key={serviceType.id} value={serviceType.id}>
+                              {serviceType.label}
+                            </SelectItem>
+                          ))}
                         </SelectContent>
                       </Select>
                       <FormMessage />
@@ -631,21 +629,22 @@ export default function Sites() {
 
               <FormField
                 control={editForm.control}
-                name="shiftType"
+                name="serviceTypeId"
                 render={({ field }) => (
                   <FormItem>
-                    <FormLabel>Tipologia Servizio</FormLabel>
+                    <FormLabel>Tipologia Servizio (opzionale)</FormLabel>
                     <Select onValueChange={field.onChange} value={field.value ?? undefined}>
                       <FormControl>
-                        <SelectTrigger data-testid="select-edit-shift-type">
+                        <SelectTrigger data-testid="select-edit-service-type">
                           <SelectValue placeholder="Seleziona tipo servizio" />
                         </SelectTrigger>
                       </FormControl>
                       <SelectContent>
-                        <SelectItem value="fixed_post">Presidio Fisso</SelectItem>
-                        <SelectItem value="patrol">Pattugliamento</SelectItem>
-                        <SelectItem value="night_inspection">Ispettorato Notturno</SelectItem>
-                        <SelectItem value="quick_response">Pronto Intervento</SelectItem>
+                        {serviceTypes?.filter(st => st.isActive).map((serviceType) => (
+                          <SelectItem key={serviceType.id} value={serviceType.id}>
+                            {serviceType.label}
+                          </SelectItem>
+                        ))}
                       </SelectContent>
                     </Select>
                     <FormMessage />
@@ -824,9 +823,14 @@ export default function Sites() {
               </CardHeader>
               <CardContent className="space-y-3">
                 <div className="flex flex-wrap gap-2">
-                  <Badge variant="outline">
-                    {shiftTypeLabels[site.shiftType]}
-                  </Badge>
+                  {site.serviceTypeId && serviceTypes && (() => {
+                    const serviceType = serviceTypes.find(st => st.id === site.serviceTypeId);
+                    return serviceType ? (
+                      <Badge variant="outline" data-testid={`badge-service-type-${site.id}`}>
+                        {serviceType.label}
+                      </Badge>
+                    ) : null;
+                  })()}
                   {(() => {
                     const status = getContractStatus(site);
                     const statusInfo = contractStatusLabels[status];