diff --git a/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx b/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx
index f3fd064ca..8b892d1dd 100644
--- a/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx
+++ b/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx
@@ -31,7 +31,7 @@ import {
   IconTrash,
 } from '@tabler/icons-react';
 import { useState } from 'react';
-import { AdvancedTable, notify, useServerTable, type AdvancedColumn } from '@ema-platform/ui';
+import { AdvancedTable, AmharicDatePicker, notify, useServerTable, type AdvancedColumn } from '@ema-platform/ui';
 import {
   extractErrorMessage,
   uploadDocument,
@@ -399,23 +399,19 @@ function SeaServiceTab() {
             onChange={(e) => setForm({ ...form, rank: e.target.value })}
           />
           <Group grow>
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Engagement date"
               required
+              dateFormat="date"
               value={form.engagementDate}
-              onChange={(e) =>
-                setForm({ ...form, engagementDate: e.target.value })
-              }
+              onChange={(val) => setForm({ ...form, engagementDate: val })}
             />
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Discharge date"
               required
+              dateFormat="date"
               value={form.dischargeDate}
-              onChange={(e) =>
-                setForm({ ...form, dischargeDate: e.target.value })
-              }
+              onChange={(val) => setForm({ ...form, dischargeDate: val })}
             />
           </Group>
           <Textarea
@@ -682,19 +678,19 @@ function MedicalTab() {
             />
           </Group>
           <Group grow>
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Issue date"
               required
+              dateFormat="date"
               value={form.issueDate}
-              onChange={(e) => setForm({ ...form, issueDate: e.target.value })}
+              onChange={(val) => setForm({ ...form, issueDate: val })}
             />
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Expiry date"
               required
+              dateFormat="date"
               value={form.expiryDate}
-              onChange={(e) => setForm({ ...form, expiryDate: e.target.value })}
+              onChange={(val) => setForm({ ...form, expiryDate: val })}
             />
           </Group>
           <Select