diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
index 8220772..64a21c9 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.iqser.red.service</groupId>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>file-management-service-api-v1</artifactId>
-            <version>2.14.0</version>
+            <version>2.21.0</version>
         </dependency>
 
         <dependency>
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 657accb..eb3203e 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
@@ -101,8 +101,7 @@ public class WordReportGenerationService {
 
         FileAttributesConfig fileAttributesConfig = fileAttributesClient.getFileAttributes(ruleSetId);
         fileAttributesConfig.getFileAttributeConfigs().forEach(fileAttributeConfig -> {
-            String fileAttributePlaceholderName = "{{file.attribute." + fileAttributeConfig.getLabel().replace(" ", "-").toLowerCase(Locale.ROOT) + "}}";
-            fileAttributePlaceholders.put(fileAttributePlaceholderName, fileAttributeConfig.getId());
+            fileAttributePlaceholders.put(fileAttributeConfig.getPlaceholder(), fileAttributeConfig.getId());
         });
         return fileAttributePlaceholders;
     }
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 f029b2d..def4533 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
@@ -91,7 +91,7 @@ public class RedactionReportIntegrationTest {
         List<ReportRedactionEntry> reportEntries = redactionLogConverterService.convertAndSort(redactionLog, legalBasisMapping);
 
         List<FileAttributeConfig> fileAttributeConfigs = new ArrayList<>();
-        fileAttributeConfigs.add(new FileAttributeConfig("3e9b9569-5d2e-4619-848b-dd0a3e96527f", "", "Document Title", true, true, FileAttributeConfig.FileAttributeType.TEXT));
+        fileAttributeConfigs.add(new FileAttributeConfig("3e9b9569-5d2e-4619-848b-dd0a3e96527f", "", "Document Title", true, true, FileAttributeConfig.FileAttributeType.TEXT, "{{file.attribute.placeholder}}"));
         FileAttributesConfig fileAttributesConfig = new FileAttributesConfig("", "", fileAttributeConfigs);
         when(fileAttributesClient.getFileAttributes(redactionLog.getRuleSetId())).thenReturn(fileAttributesConfig);