diff --git a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
index c036a86fc..d5814f2a3 100644
--- a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
+++ b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
@@ -13,7 +13,7 @@ import {
   type FormSectionConfig,
   type Vessel,
 } from '@ema-platform/api';
-import { CountrySelect } from '@ema-platform/ui';
+import { AmharicDatePicker, CountrySelect } from '@ema-platform/ui';
 
 interface Props {
   section: FormSectionConfig;
@@ -197,11 +197,16 @@ export function ConfigDrivenSection({
                 thousandSeparator={field.type === 'MONEY' ? ',' : undefined}
               />
             ) : field.type === 'DATE' ? (
-              <TextInput
-                {...common}
-                type="date"
+              // AmharicDatePicker has no `description`/`withAsterisk` props (from
+              // `common`) — pass `required` explicitly so the asterisk still shows.
+              <AmharicDatePicker
+                label={label}
+                error={error}
+                disabled={common.disabled}
+                required={field.required}
+                dateFormat="date"
                 value={(value as string) ?? ''}
-                onChange={(e) => onChange(field.key, e.currentTarget.value)}
+                onChange={(v) => onChange(field.key, v)}
               />
             ) : field.type === 'TEXTAREA' ? (
               <Textarea