diff --git a/plugins/setting-assets/lang/cs.json b/plugins/setting-assets/lang/cs.json
index 4638a65051..60c8ac25ef 100644
--- a/plugins/setting-assets/lang/cs.json
+++ b/plugins/setting-assets/lang/cs.json
@@ -137,6 +137,7 @@
     "DataToExport": "Data k exportu",
     "ExportDocuments": "Dokumenty",
     "ExportIssues": "Problémy",
+    "ExportMilestones": "Milníky",
     "ExportTestCases": "Testovací případy",
     "ExportTestRuns": "Běhy testů",
     "ExportTestPlans": "Testovací plány",
diff --git a/plugins/setting-assets/lang/de.json b/plugins/setting-assets/lang/de.json
index d269413be6..b94cf4d422 100644
--- a/plugins/setting-assets/lang/de.json
+++ b/plugins/setting-assets/lang/de.json
@@ -137,6 +137,7 @@
     "DataToExport": "Zu exportierende Daten",
     "ExportDocuments": "Dokumente",
     "ExportIssues": "Probleme",
+    "ExportMilestones": "Meilensteine",
     "ExportTestCases": "Testfälle",
     "ExportTestRuns": "Testläufe",
     "ExportTestPlans": "Testpläne",
diff --git a/plugins/setting-assets/lang/en.json b/plugins/setting-assets/lang/en.json
index 7b4fce18a6..b2fe98c744 100644
--- a/plugins/setting-assets/lang/en.json
+++ b/plugins/setting-assets/lang/en.json
@@ -137,6 +137,7 @@
     "DataToExport": "Data to export",
     "ExportDocuments": "Documents",
     "ExportIssues": "Issues",
+    "ExportMilestones": "Milestones",
     "ExportTestCases": "Test Cases",
     "ExportTestRuns": "Test Runs", 
     "ExportTestPlans": "Test Plans",
diff --git a/plugins/setting-assets/lang/es.json b/plugins/setting-assets/lang/es.json
index 4907944b2d..0a7a171504 100644
--- a/plugins/setting-assets/lang/es.json
+++ b/plugins/setting-assets/lang/es.json
@@ -128,6 +128,7 @@
     "DataToExport": "Datos a exportar",
     "ExportDocuments": "Documentos",
     "ExportIssues": "Problemas",
+    "ExportMilestones": "Hitos",
     "ExportTestCases": "Casos de prueba",
     "ExportTestRuns": "Ejecuciones de prueba",
     "ExportTestPlans": "Planes de prueba",
diff --git a/plugins/setting-assets/lang/fr.json b/plugins/setting-assets/lang/fr.json
index ba3eb349e6..65572e7df4 100644
--- a/plugins/setting-assets/lang/fr.json
+++ b/plugins/setting-assets/lang/fr.json
@@ -137,6 +137,7 @@
     "DataToExport": "Données à exporter",
     "ExportDocuments": "Documents",
     "ExportIssues": "Problèmes",
+    "ExportMilestones": "Jalons",
     "ExportTestCases": "Cas de test",
     "ExportTestRuns": "Exécutions de test",
     "ExportTestPlans": "Plans de test",
diff --git a/plugins/setting-assets/lang/it.json b/plugins/setting-assets/lang/it.json
index 359d813c92..1e30a4af07 100644
--- a/plugins/setting-assets/lang/it.json
+++ b/plugins/setting-assets/lang/it.json
@@ -137,6 +137,7 @@
     "DataToExport": "Dati da esportare",
     "ExportDocuments": "Documenti",
     "ExportIssues": "Problemi",
+    "ExportMilestones": "Milestone",
     "ExportTestCases": "Casi di test",
     "ExportTestRuns": "Esecuzioni di test",
     "ExportTestPlans": "Piani di test",
diff --git a/plugins/setting-assets/lang/pt.json b/plugins/setting-assets/lang/pt.json
index c5ede893ba..b8196dbc41 100644
--- a/plugins/setting-assets/lang/pt.json
+++ b/plugins/setting-assets/lang/pt.json
@@ -128,6 +128,7 @@
     "DataToExport": "Dados para exportar",
     "ExportDocuments": "Documentos",
     "ExportIssues": "Problemas",
+    "ExportMilestones": "Marcos",
     "ExportTestCases": "Casos de teste",
     "ExportTestRuns": "Execuções de teste",
     "ExportTestPlans": "Planos de teste",
diff --git a/plugins/setting-assets/lang/ru.json b/plugins/setting-assets/lang/ru.json
index fb6770a036..16746b3469 100644
--- a/plugins/setting-assets/lang/ru.json
+++ b/plugins/setting-assets/lang/ru.json
@@ -138,6 +138,7 @@
     "DataToExport": "Данные для экспорта",
     "ExportDocuments": "Документы",
     "ExportIssues": "Задачи",
+    "ExportMilestones": "Этапы",
     "ExportTestCases": "Тест-кейсы",
     "ExportTestRuns": "Прогоны тестов",
     "ExportTestPlans": "Планы тестирования",
diff --git a/plugins/setting-assets/lang/zh.json b/plugins/setting-assets/lang/zh.json
index edcda7a238..b3e451dbc6 100644
--- a/plugins/setting-assets/lang/zh.json
+++ b/plugins/setting-assets/lang/zh.json
@@ -137,6 +137,7 @@
     "DataToExport": "要导出的数据",
     "ExportDocuments": "文档",
     "ExportIssues": "问题",
+    "ExportMilestones": "里程碑",
     "ExportTestCases": "测试用例",
     "ExportTestRuns": "测试运行",
     "ExportTestPlans": "测试计划",
diff --git a/plugins/setting-resources/src/components/Export.svelte b/plugins/setting-resources/src/components/Export.svelte
index ef86c1a5b3..ddebda2cf9 100644
--- a/plugins/setting-resources/src/components/Export.svelte
+++ b/plugins/setting-resources/src/components/Export.svelte
@@ -21,6 +21,7 @@
 
   const classItems = [
     { id: 'tracker:class:Issue', label: setting.string.ExportIssues },
+    { id: 'tracker:class:Milestone', label: setting.string.ExportMilestones },
     { id: 'document:class:Document', label: setting.string.ExportDocuments },
     { id: 'testManagement:class:TestCase', label: setting.string.ExportTestCases },
     { id: 'testManagement:class:TestRun', label: setting.string.ExportTestRuns },
diff --git a/plugins/setting-resources/src/plugin.ts b/plugins/setting-resources/src/plugin.ts
index 06a6945c5e..ceacc27a89 100644
--- a/plugins/setting-resources/src/plugin.ts
+++ b/plugins/setting-resources/src/plugin.ts
@@ -119,6 +119,7 @@ export default mergeIds(settingId, setting, {
     DataToExport: '' as IntlString,
     ExportDocuments: '' as IntlString,
     ExportIssues: '' as IntlString,
+    ExportMilestones: '' as IntlString,
     ExportTestCases: '' as IntlString,
     ExportTestRuns: '' as IntlString,
     ExportTestPlans: '' as IntlString,
diff --git a/services/export/pod-export/src/converter.ts b/services/export/pod-export/src/converter.ts
index d5681c8687..034f7395f9 100644
--- a/services/export/pod-export/src/converter.ts
+++ b/services/export/pod-export/src/converter.ts
@@ -214,7 +214,7 @@ export class UnifiedConverter {
       return await Promise.all(collectionDocs.map(async (doc) => await this.convert(doc)))
     }
 
-    if (type._class === core.class.TypeTimestamp) {
+    if (type._class === core.class.TypeTimestamp || type._class === core.class.TypeDate) {
       return this.formatTimestamp(value as number)
     }