diff --git a/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts b/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts
index 93196578d..a36ffa5da 100644
--- a/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts
+++ b/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts
@@ -32,71 +32,83 @@ export class CreateInvoices1821000000002 implements MigrationInterface {
       `);
     }
 
-    await queryRunner.query(`
-      CREATE TABLE freight.invoices (
-        id uuid NOT NULL DEFAULT uuid_generate_v4(),
-        invoice_number varchar(64) NOT NULL,
-        company_id uuid NOT NULL,
-        company_profile_id uuid NOT NULL,
-        total_amount numeric(14, 2) NOT NULL,
-        currency varchar(8) NOT NULL DEFAULT 'ETB',
-        status freight.invoices_status_enum NOT NULL DEFAULT 'DRAFT',
-        source varchar(255) NOT NULL,
-        source_id varchar(255) NOT NULL,
-        type varchar(255) NOT NULL,
-        issued_at timestamptz,
-        payment_id uuid,
-        due_at timestamptz NOT NULL,
-        created_at timestamptz NOT NULL DEFAULT now(),
-        updated_at timestamptz NOT NULL DEFAULT now(),
-        deleted_at timestamptz,
-        CONSTRAINT pk_invoices PRIMARY KEY (id),
-        CONSTRAINT uq_invoices_invoice_number UNIQUE (invoice_number),
-        CONSTRAINT fk_invoices_company FOREIGN KEY (company_id)
-          REFERENCES freight.companies (id) ON DELETE RESTRICT,
-        CONSTRAINT fk_invoices_company_profile FOREIGN KEY (company_profile_id)
-          REFERENCES freight.company_profiles (id) ON DELETE RESTRICT,
-        CONSTRAINT fk_invoices_payment FOREIGN KEY (payment_id)
-          REFERENCES freight.payments (id) ON DELETE SET NULL
+    const invoicesExists = await queryRunner.query(
+      `SELECT 1 FROM information_schema.tables WHERE table_schema = 'freight' AND table_name = 'invoices';`,
+    );
+
+    if (!invoicesExists.length) {
+      await queryRunner.query(`
+        CREATE TABLE freight.invoices (
+          id uuid NOT NULL DEFAULT uuid_generate_v4(),
+          invoice_number varchar(64) NOT NULL,
+          company_id uuid NOT NULL,
+          company_profile_id uuid NOT NULL,
+          total_amount numeric(14, 2) NOT NULL,
+          currency varchar(8) NOT NULL DEFAULT 'ETB',
+          status freight.invoices_status_enum NOT NULL DEFAULT 'DRAFT',
+          source varchar(255) NOT NULL,
+          source_id varchar(255) NOT NULL,
+          type varchar(255) NOT NULL,
+          issued_at timestamptz,
+          payment_id uuid,
+          due_at timestamptz NOT NULL,
+          created_at timestamptz NOT NULL DEFAULT now(),
+          updated_at timestamptz NOT NULL DEFAULT now(),
+          deleted_at timestamptz,
+          CONSTRAINT pk_invoices PRIMARY KEY (id),
+          CONSTRAINT uq_invoices_invoice_number UNIQUE (invoice_number),
+          CONSTRAINT fk_invoices_company FOREIGN KEY (company_id)
+            REFERENCES freight.companies (id) ON DELETE RESTRICT,
+          CONSTRAINT fk_invoices_company_profile FOREIGN KEY (company_profile_id)
+            REFERENCES freight.company_profiles (id) ON DELETE RESTRICT,
+          CONSTRAINT fk_invoices_payment FOREIGN KEY (payment_id)
+            REFERENCES freight.payments (id) ON DELETE SET NULL
+        );
+      `);
+
+      await queryRunner.query(
+        `CREATE INDEX idx_invoices_company ON freight.invoices (company_id);`,
       );
-    `);
-
-    await queryRunner.query(
-      `CREATE INDEX idx_invoices_company ON freight.invoices (company_id);`,
-    );
-    await queryRunner.query(
-      `CREATE INDEX idx_invoices_company_profile ON freight.invoices (company_profile_id);`,
-    );
-    await queryRunner.query(
-      `CREATE INDEX idx_invoices_source ON freight.invoices (source, source_id);`,
-    );
-    await queryRunner.query(
-      `CREATE INDEX idx_invoices_status ON freight.invoices (status);`,
-    );
-
-    await queryRunner.query(`
-      CREATE TABLE freight.invoice_lines (
-        id uuid NOT NULL DEFAULT uuid_generate_v4(),
-        invoice_id uuid NOT NULL,
-        charge_type varchar NOT NULL,
-        description varchar(255),
-        quantity numeric(12, 2) NOT NULL DEFAULT 1,
-        unit_rate numeric(14, 2) NOT NULL DEFAULT 0,
-        amount numeric(14, 2) NOT NULL,
-        currency varchar(8) NOT NULL DEFAULT 'ETB',
-        metadata jsonb,
-        created_at timestamptz NOT NULL DEFAULT now(),
-        updated_at timestamptz NOT NULL DEFAULT now(),
-        deleted_at timestamptz,
-        CONSTRAINT pk_invoice_lines PRIMARY KEY (id),
-        CONSTRAINT fk_invoice_lines_invoice FOREIGN KEY (invoice_id)
-          REFERENCES freight.invoices (id) ON DELETE CASCADE
+      await queryRunner.query(
+        `CREATE INDEX idx_invoices_company_profile ON freight.invoices (company_profile_id);`,
       );
-    `);
+      await queryRunner.query(
+        `CREATE INDEX idx_invoices_source ON freight.invoices (source, source_id);`,
+      );
+      await queryRunner.query(
+        `CREATE INDEX idx_invoices_status ON freight.invoices (status);`,
+      );
+    }
 
-    await queryRunner.query(
-      `CREATE INDEX idx_invoice_lines_invoice ON freight.invoice_lines (invoice_id);`,
+    const invoiceLinesExists = await queryRunner.query(
+      `SELECT 1 FROM information_schema.tables WHERE table_schema = 'freight' AND table_name = 'invoice_lines';`,
     );
+
+    if (!invoiceLinesExists.length) {
+      await queryRunner.query(`
+        CREATE TABLE freight.invoice_lines (
+          id uuid NOT NULL DEFAULT uuid_generate_v4(),
+          invoice_id uuid NOT NULL,
+          charge_type varchar NOT NULL,
+          description varchar(255),
+          quantity numeric(12, 2) NOT NULL DEFAULT 1,
+          unit_rate numeric(14, 2) NOT NULL DEFAULT 0,
+          amount numeric(14, 2) NOT NULL,
+          currency varchar(8) NOT NULL DEFAULT 'ETB',
+          metadata jsonb,
+          created_at timestamptz NOT NULL DEFAULT now(),
+          updated_at timestamptz NOT NULL DEFAULT now(),
+          deleted_at timestamptz,
+          CONSTRAINT pk_invoice_lines PRIMARY KEY (id),
+          CONSTRAINT fk_invoice_lines_invoice FOREIGN KEY (invoice_id)
+            REFERENCES freight.invoices (id) ON DELETE CASCADE
+        );
+      `);
+
+      await queryRunner.query(
+        `CREATE INDEX idx_invoice_lines_invoice ON freight.invoice_lines (invoice_id);`,
+      );
+    }
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
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 569511d30..52b3d7139 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -441,10 +441,10 @@ const FirstMilePage = () => {
   });
 
   const allocateMutation = useMutation({
-    mutationFn: (data) => apiClient.post(`/first-mile/${containerAllocationFirstMileId}/allocate-containers`, data),
+    mutationFn: (data) => api.post(`/first-mile/${containerAllocationFirstMileId}/allocate-containers`, data),
     onSuccess: () => {
       toast({ title: "Containers allocated" });
-      void qc.invalidateQueries({ queryKey: QUERY_KEYS.FIRST_MILE.detail(containerAllocationFirstMileId ?? "") });
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.FIRST_MILE.byId(containerAllocationFirstMileId ?? "") });
       setContainerAllocationOpen(false);
       setContainerAllocationFirstMileId(null);
     },
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 3de5e578e..a40721a1c 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -395,7 +395,7 @@ const LastMilePage = () => {
       api.post(`/last-mile/${activeId}/allocate-containers`, data),
     onSuccess: () => {
       toast({ title: "Containers allocated", variant: "default" });
-      void qc.invalidateQueries({ queryKey: QUERY_KEYS.LAST_MILE.detail(activeId ?? "") });
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.LAST_MILE.byId(activeId ?? "") });
       closeAllocation();
     },
     onError: () => {