diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
index 35b533a..9773357 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
@@ -23,7 +23,11 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDate;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
@@ -107,7 +111,13 @@ public class WordReportGenerationService {
                         if (dossierAttribute.getValue() == null) {
                             dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), "");
                         } else {
-                            dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), dossierAttribute.getValue());
+                            if(attributeConfig.getType().equals(DossierAttributeType.DATE)) {
+                                OffsetDateTime dt = OffsetDateTime.parse(dossierAttribute.getValue());
+                                String date = FORMAT_DATE_ISO.format(dt);
+                                dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), date);
+                            } else {
+                                dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), dossierAttribute.getValue());
+                            }
                         }
                     }
                 }
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
index d702dab..b4c5d97 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
@@ -282,7 +282,7 @@ public class RedactionReportIntegrationTest {
         DossierAttribute dossierAttribute2 = new DossierAttribute(dossierId, "id2", "Reporter Status");
         DossierAttribute dossierAttribute3 = new DossierAttribute(dossierId, "id3", "Dossier Name");
         DossierAttribute dossierAttribute4 = new DossierAttribute(dossierId, "id4", "Firma");
-        DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", OffsetDateTime.now().format(FORMAT_DATE_ENG));
+        DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", "2021-11-09T23:00:00.000Z");
         DossierAttribute dossierAttribute6 = new DossierAttribute(dossierId, "id6", "data:image/png;base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(imageResource.getInputStream())));
 
         when(dossierAttributesClient.getDossierAttributes("dossierId")).thenReturn(List.of(dossierAttribute, dossierAttribute2, dossierAttribute3, dossierAttribute4, dossierAttribute5, dossierAttribute6));
@@ -302,7 +302,7 @@ public class RedactionReportIntegrationTest {
                 .storageId(storageId)
                 .build());
 
-        ClassPathResource wordTemplateResource = new ClassPathResource("templates/Justification Appendix A2.docx");
+        ClassPathResource wordTemplateResource = new ClassPathResource("templates/Justification Appendix A1.docx");
         when(reportStorageService.getReportTemplate(storageId)).thenReturn(IOUtils.toByteArray(wordTemplateResource.getInputStream()));
         ReportTemplate reportTemplate = ReportTemplate.builder()
                 .dossierTemplateId("dossierTemplateId")
@@ -380,7 +380,7 @@ public class RedactionReportIntegrationTest {
         DossierAttribute dossierAttribute2 = new DossierAttribute(dossierId, "id2", "Reporter Status");
         DossierAttribute dossierAttribute3 = new DossierAttribute(dossierId, "id3", "Dossier Name");
         DossierAttribute dossierAttribute4 = new DossierAttribute(dossierId, "id4", "Firma");
-        DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", OffsetDateTime.now().format(FORMAT_DATE_ENG));
+        DossierAttribute dossierAttribute5 = new DossierAttribute(dossierId, "id5", "2021-11-09T23:00:00.000Z");
         DossierAttribute dossierAttribute6 = new DossierAttribute(dossierId, "id6", "data:image/png;base64," + Base64.getEncoder().encodeToString(IOUtils.toByteArray(imageResource.getInputStream())));
 
         when(dossierAttributesClient.getDossierAttributes("dossierId")).thenReturn(List.of(dossierAttribute, dossierAttribute2, dossierAttribute3, dossierAttribute4, dossierAttribute5, dossierAttribute6));