diff --git a/apps/edr-freight-web/backoffice/src/components/ContainerAllocationTable.tsx b/apps/edr-freight-web/backoffice/src/components/ContainerAllocationTable.tsx
index 950cfd476..ab1fd028d 100644
--- a/apps/edr-freight-web/backoffice/src/components/ContainerAllocationTable.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ContainerAllocationTable.tsx
@@ -42,8 +42,8 @@ export function ContainerAllocationTable({
   );
 
   const { data: vehicles = [], isLoading: vehiclesLoading } = useQuery({
-    queryKey: ["vehicles", "active"],
-    queryFn: () => vehiclesService.getAll({ status: "ACTIVE" }),
+    queryKey: ["vehicles", "free"],
+    queryFn: () => vehiclesService.getAll({ status: "FREE" }),
   });
 
   const vehicleOptions = useMemo(
@@ -99,7 +99,7 @@ export function ContainerAllocationTable({
     <Stack gap="md">
       {vehicles.length === 0 && (
         <Alert icon={<AlertCircle size={16} />} color="yellow">
-          No active vehicles available. Add vehicles before allocating containers.
+          No free vehicles available. Free up or add vehicles before allocating containers.
         </Alert>
       )}
 
diff --git a/apps/edr-freight-web/backoffice/src/components/FirstMileContainerAllocationTable.tsx b/apps/edr-freight-web/backoffice/src/components/FirstMileContainerAllocationTable.tsx
index 85bba1dc4..a1fc03539 100644
--- a/apps/edr-freight-web/backoffice/src/components/FirstMileContainerAllocationTable.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/FirstMileContainerAllocationTable.tsx
@@ -42,8 +42,8 @@ export function FirstMileContainerAllocationTable({
   );
 
   const { data: vehicles = [], isLoading: vehiclesLoading } = useQuery({
-    queryKey: ["vehicles", "active"],
-    queryFn: () => vehiclesService.getAll({ status: "ACTIVE" }),
+    queryKey: ["vehicles", "free"],
+    queryFn: () => vehiclesService.getAll({ status: "FREE" }),
   });
 
   const vehicleOptions = useMemo(
@@ -99,7 +99,7 @@ export function FirstMileContainerAllocationTable({
     <Stack gap="md">
       {vehicles.length === 0 && (
         <Alert icon={<AlertCircle size={16} />} color="yellow">
-          No active vehicles available. Add vehicles before allocating containers.
+          No free vehicles available. Free up or add vehicles before allocating containers.
         </Alert>
       )}
 
diff --git a/apps/edr-freight-web/backoffice/src/components/LastMileContainerAllocationTable.tsx b/apps/edr-freight-web/backoffice/src/components/LastMileContainerAllocationTable.tsx
index d11d99a4a..1795aa793 100644
--- a/apps/edr-freight-web/backoffice/src/components/LastMileContainerAllocationTable.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/LastMileContainerAllocationTable.tsx
@@ -42,8 +42,8 @@ export function LastMileContainerAllocationTable({
   );
 
   const { data: vehicles = [], isLoading: vehiclesLoading } = useQuery({
-    queryKey: ["vehicles", "active"],
-    queryFn: () => vehiclesService.getAll({ status: "ACTIVE" }),
+    queryKey: ["vehicles", "free"],
+    queryFn: () => vehiclesService.getAll({ status: "FREE" }),
   });
 
   const vehicleOptions = useMemo(
@@ -99,7 +99,7 @@ export function LastMileContainerAllocationTable({
     <Stack gap="md">
       {vehicles.length === 0 && (
         <Alert icon={<AlertCircle size={16} />} color="yellow">
-          No active vehicles available. Add vehicles before allocating containers.
+          No free vehicles available. Free up or add vehicles before allocating containers.
         </Alert>
       )}
 
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
index 198fe50a3..34bf68c21 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -355,9 +355,9 @@ const FirstMilePage = () => {
   });
 
   const { data: vehiclesData } = useQuery({
-    queryKey: ["vehicles", "list"],
+    queryKey: ["vehicles", "free"],
     queryFn: async () => {
-      const res = await vehiclesService.getAll({ status: "ACTIVE" });
+      const res = await vehiclesService.getAll({ status: "FREE" });
       return res.data;
     },
   });
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
index eb00c0904..ba02483a7 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -339,9 +339,9 @@ const LastMilePage = () => {
   });
 
   const { data: vehiclesData } = useQuery({
-    queryKey: ["vehicles", "list"],
+    queryKey: ["vehicles", "free"],
     queryFn: async () => {
-      const res = await vehiclesService.getAll({ status: "ACTIVE" });
+      const res = await vehiclesService.getAll({ status: "FREE" });
       return res.data;
     },
   });