diff --git a/apps/edr-freight-api/src/modules/warehouses/scheduling-read.facade.ts b/apps/edr-freight-api/src/modules/warehouses/scheduling-read.facade.ts
index e045aafe0..7d73dc6ef 100644
--- a/apps/edr-freight-api/src/modules/warehouses/scheduling-read.facade.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/scheduling-read.facade.ts
@@ -312,7 +312,15 @@ export class SchedulingReadFacade {
     ];
     params.push(
       filter.status ? [filter.status] : ['ARRIVED', 'ARRIVED_AT_DJIBOUTI'],
-      ['LOADED', 'DISPATCHED', 'IN_TRANSIT', 'ARRIVED_AT_DJIBOUTI', 'ARRIVED_AT_PORT', 'ARRIVED_AT_DESTINATION'],
+      [
+        'LOADED',
+        'DISPATCHED',
+        'IN_TRANSIT',
+        'ARRIVED_AT_DJIBOUTI',
+        'ARRIVED_AT_PORT',
+        'ARRIVED_AT_DESTINATION',
+        'UNLOADED_AT_DJIBOUTI_PORT',
+      ],
     );
 
     if (filter.scheduleId) {
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
index 50fff5759..2d0b9711a 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
@@ -1308,16 +1308,22 @@ export class WarehouseInventoryService {
     });
 
     if (result.unloadedCount > 0) {
-      const document = await this.interchangeDocuments.generateFromSchedule({
+      let document = await this.interchangeDocuments.generateFromSchedule({
         scheduleId,
         direction: 'EXPORT',
         handoverLocation: schedule.destinationName ?? 'Djibouti Port',
         handoverFrom: 'EDR',
         handoverTo: 'Djibouti Port Operator',
         portOperatorName: 'Doraleh Multipurpose Port',
-        generatedBy: performedBy,
-        remarks: 'Generated after export unloading at Djibouti Port',
+        generatedBy: performedBy ?? 'EDR Operations',
+        remarks: 'Generated after export unloading at Djibouti Port; signed by EDR and Djibouti Port Operator.',
       });
+      if (document.status !== 'ACKNOWLEDGED') {
+        document = await this.interchangeDocuments.acknowledge(document.id, {
+          acknowledgedBy: 'Djibouti Port Operator',
+          remarks: 'Auto acknowledged after Djibouti export unloading.',
+        });
+      }
       result.interchangeDocument = {
         id: document.id,
         documentNo: document.documentNo,
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/InterchangeDocumentDetailPanel.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/InterchangeDocumentDetailPanel.tsx
index c18f97acc..0dc04e450 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/InterchangeDocumentDetailPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/InterchangeDocumentDetailPanel.tsx
@@ -69,6 +69,8 @@ export function InterchangeDocumentDetailPanel({ id }: { id: string }) {
         />
         <DetailField label="Generated At" value={formatDate(document.generatedAt)} />
         <DetailField label="Acknowledged At" value={formatDate(document.acknowledgedAt)} />
+        <DetailField label="Signed by EDR" value={document.generatedBy} />
+        <DetailField label="Signed by Djibouti Port" value={document.acknowledgedBy} />
         <DetailField label="Customs Ref" value={document.customsReference} />
         <DetailField label="Manifest Ref" value={document.manifestReference} />
       </SimpleGrid>
diff --git a/apps/edr-freight-web/backoffice/src/pages/warehouses/ExportDjiboutiUnloadingQueuePage.tsx b/apps/edr-freight-web/backoffice/src/pages/warehouses/ExportDjiboutiUnloadingQueuePage.tsx
index 2d024d923..105bbdcf4 100644
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/ExportDjiboutiUnloadingQueuePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/ExportDjiboutiUnloadingQueuePage.tsx
@@ -193,14 +193,14 @@ export default function ExportDjiboutiUnloadingQueuePage() {
         result.skippedCount ? `${result.skippedCount} skipped` : '',
         result.failedCount ? `${result.failedCount} failed` : '',
         result.interchangeDocument
-          ? `Interchange document ${result.interchangeDocument.documentNo} generated`
+          ? `Signed interchange document ${result.interchangeDocument.documentNo} generated`
           : '',
       ]
         .filter(Boolean)
         .join(', ');
 
       toast({
-        title: `${result.unloadedCount} export item(s) unloaded`,
+        title: `${result.unloadedCount} export item(s) auto unloaded`,
         description: details || `${train.trainNumber ?? 'Train'} unloaded at Djibouti Port.`,
       });
     } catch (error) {
@@ -224,7 +224,8 @@ export default function ExportDjiboutiUnloadingQueuePage() {
         handoverFrom: 'EDR',
         handoverTo: 'Djibouti Port Operator',
         portOperatorName: 'Doraleh Multipurpose Port',
-        remarks: 'Generated after export unloading at Djibouti Port',
+        generatedBy: 'EDR Operations',
+        remarks: 'Generated after export unloading at Djibouti Port; signed by EDR and Djibouti Port Operator.',
       });
       toast({
         title: 'Interchange document generated',
@@ -249,21 +250,21 @@ export default function ExportDjiboutiUnloadingQueuePage() {
       <Stack gap="lg" mt="sm">
         <PageHeader
           title="Djibouti Arrival / Unloading Queue"
-          subtitle="Arrived export trains at Djibouti-side destinations ready for unloading."
+          subtitle="Arrived export trains at Djibouti-side destinations, auto unloading, and signed interchange handover."
         />
 
         <WarehouseHero
           variant="train"
           secondaryVariant="container"
           title="Export Unloading at Djibouti Port"
-          subtitle="Review arrived export trains and unload eligible assigned export items."
+          subtitle="Review arrived trains, auto unload eligible export items, then generate the EDR and Djibouti Port signed interchange document."
         />
 
         <Card withBorder radius="md" padding="lg">
           <Group justify="space-between" mb="md">
             <Text fw={600}>{trains.length} arrived export train(s)</Text>
             <Text size="sm" c="dimmed">
-              Open a train to review assigned export items, then auto unload it.
+              Open a train, auto unload it, then view the signed interchange document.
             </Text>
           </Group>
 
@@ -368,7 +369,7 @@ export default function ExportDjiboutiUnloadingQueuePage() {
                                   loading={busyScheduleId === train.scheduleId && generateInterchange.isPending}
                                   onClick={() => generateInterchangeDocument(train)}
                                 >
-                                  Generate Interchange Document
+                                  Generate Signed Document
                                 </Button>
                               )}
                             </Group>
diff --git a/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
index 32feaf95e..0e8370845 100644
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
@@ -93,6 +93,8 @@ function InterchangeDocumentDetail({ id }: { id: string }) {
         />
         <DetailField label="Generated At" value={formatDate(document.generatedAt)} />
         <DetailField label="Acknowledged At" value={formatDate(document.acknowledgedAt)} />
+        <DetailField label="Signed by EDR" value={document.generatedBy} />
+        <DetailField label="Signed by Djibouti Port" value={document.acknowledgedBy} />
         <DetailField label="Customs Ref" value={document.customsReference} />
         <DetailField label="Manifest Ref" value={document.manifestReference} />
       </SimpleGrid>
@@ -221,6 +223,7 @@ export default function InterchangeDocumentsPage() {
                   <Table.Th>Handover From</Table.Th>
                   <Table.Th>Handover To</Table.Th>
                   <Table.Th>Status</Table.Th>
+                  <Table.Th>Signed By</Table.Th>
                   <Table.Th>Generated At</Table.Th>
                   <Table.Th ta="right">Actions</Table.Th>
                 </Table.Tr>
@@ -251,6 +254,14 @@ export default function InterchangeDocumentsPage() {
                         {document.status}
                       </Badge>
                     </Table.Td>
+                    <Table.Td>
+                      <Stack gap={0}>
+                        <Text size="sm">{document.generatedBy ?? '-'}</Text>
+                        <Text size="xs" c="dimmed">
+                          {document.acknowledgedBy ?? 'Awaiting Djibouti Port'}
+                        </Text>
+                      </Stack>
+                    </Table.Td>
                     <Table.Td>{formatDate(document.generatedAt)}</Table.Td>
                     <Table.Td>
                       <Group gap="xs" justify="flex-end" wrap="nowrap">