diff --git a/apps/edr-freight-api/src/modules/first-mile/first-mile-invoice.service.ts b/apps/edr-freight-api/src/modules/first-mile/first-mile-invoice.service.ts
index 22520aac1..f7d9ee11f 100644
--- a/apps/edr-freight-api/src/modules/first-mile/first-mile-invoice.service.ts
+++ b/apps/edr-freight-api/src/modules/first-mile/first-mile-invoice.service.ts
@@ -71,7 +71,7 @@ export class FirstMileInvoiceService {
       type: 'DELIVERY_FEE',
       companyId: fm.booking!.companyId,
       companyProfileId: fm.booking!.companyProfileId || '',
-      currency: 'ETB',
+      currency: fm.booking!.paymentCurrency || 'ETB',
       lines: [
         {
           chargeType: 'DELIVERY',
diff --git a/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts b/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts
index d5f53ae0c..444cbee87 100644
--- a/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts
+++ b/apps/edr-freight-api/src/modules/first-mile/first-mile.controller.ts
@@ -92,6 +92,7 @@ export class FirstMileController {
     const record = await this.firstMileService.update(id, dto);
     // Auto-generate invoice if distance or payment was updated
     const booking  = await this.bookingsService.findById(record.bookingId);
+    const currency = booking.paymentCurrency || "ETB";
     if (dto.exactKm !== undefined || dto.exactKm != record.exactKm || dto.remainingPayment !== undefined || dto.remainingPayment !== record.remainingPayment) {
     await this.billingService.generateInvoice({
       source: Freight.InvoiceSource.FirstMile,
@@ -99,7 +100,7 @@ export class FirstMileController {
       type: "FIRST_MILE",
       companyId: booking.companyId,
       companyProfileId: booking.companyProfileId,
-      currency: "ETB",
+      currency,
 
       lines: [
         {
@@ -108,7 +109,7 @@ export class FirstMileController {
           quantity: 1,
           unitRate: record.remainingPayment,
           amount: record.remainingPayment,
-          currency: "ETB",
+          currency,
         },
       ],
 
diff --git a/apps/edr-freight-api/src/modules/last-mile/last-mile-invoice.service.ts b/apps/edr-freight-api/src/modules/last-mile/last-mile-invoice.service.ts
index c304a89e8..e40e94509 100644
--- a/apps/edr-freight-api/src/modules/last-mile/last-mile-invoice.service.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/last-mile-invoice.service.ts
@@ -61,7 +61,7 @@ export class LastMileInvoiceService {
       type: 'DELIVERY_FEE',
       companyId: lm.booking!.companyId,
       companyProfileId: lm.booking!.companyProfileId || '',
-      currency: 'ETB',
+      currency: lm.booking!.paymentCurrency || 'ETB',
       lines: [
         {
           chargeType: 'DELIVERY',
diff --git a/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts b/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts
index 88a96e6c2..9ad5a00bf 100644
--- a/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/last-mile.controller.ts
@@ -86,6 +86,7 @@ export class LastMileController {
     const record = await this.lastMileService.update(id, dto);
     // Auto-generate invoice if distance or payment was updated
       const booking  = await this.bookingsService.findById(record.bookingId);
+      const currency = booking.paymentCurrency || "ETB";
         if (dto.exactKm !== undefined || dto.exactKm != record.exactKm || dto.remainingPayment !== undefined || dto.remainingPayment !== record.remainingPayment) {
         await this.billingService.generateInvoice({
           source: Freight.InvoiceSource.LastMile,
@@ -93,8 +94,8 @@ export class LastMileController {
           type: "LAST_MILE",
           companyId: booking.companyId,
           companyProfileId: booking.companyProfileId,
-          currency: "ETB",
-    
+          currency,
+
           lines: [
             {
               chargeType: "LAST_MILE",
@@ -102,7 +103,7 @@ export class LastMileController {
               quantity: 1,
               unitRate: record.remainingPayment,
               amount: record.remainingPayment,
-              currency: "ETB",
+              currency,
             },
           ],