diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleController.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleController.java
index 9b10d060..05c0a1fd 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleController.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleController.java
@@ -135,7 +135,8 @@ public ResponseEntity<Map<String, List<ValidationRuleDto>>> downloadValidationRu
      * Endpoint to upload a Validation Rule.
      */
     @CertificateAuthenticationRequired
-    @PostMapping(path = "", consumes = CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE)
+    @PostMapping(path = "", consumes = {
+        CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE, CmsStringMessageConverter.CONTENT_TYPE_CMS_VALUE})
     @Operation(
         security = {
             @SecurityRequirement(name = OpenApiConfig.SECURITY_SCHEMA_HASH),
@@ -177,7 +178,7 @@ public ResponseEntity<Void> uploadValidationRule(
                 "Submitted string needs to be signed by a valid upload certificate");
         }
 
-        ValidationRuleEntity createdValidationRule = null;
+        ValidationRuleEntity createdValidationRule;
 
         try {
             createdValidationRule = validationRuleService.addValidationRule(
@@ -233,7 +234,8 @@ public ResponseEntity<Void> uploadValidationRule(
      * Endpoint to delete a Validation Rule.
      */
     @CertificateAuthenticationRequired
-    @DeleteMapping(path = "", consumes = CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE)
+    @DeleteMapping(path = "", consumes = {
+        CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE, CmsStringMessageConverter.CONTENT_TYPE_CMS_VALUE})
     @Operation(
         security = {
             @SecurityRequirement(name = OpenApiConfig.SECURITY_SCHEMA_HASH),
@@ -330,7 +332,8 @@ public ResponseEntity<Void> deleteValidationRules(
      * Alias endpoint to delete a Validation Rule.
      */
     @CertificateAuthenticationRequired
-    @PostMapping(path = "/delete", consumes = CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE)
+    @PostMapping(path = "/delete", consumes = {
+        CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE, CmsStringMessageConverter.CONTENT_TYPE_CMS_VALUE})
     @Operation(
         security = {
             @SecurityRequirement(name = OpenApiConfig.SECURITY_SCHEMA_HASH),
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/converter/CmsStringMessageConverter.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/converter/CmsStringMessageConverter.java
index 07b24cec..535695a4 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/restapi/converter/CmsStringMessageConverter.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/restapi/converter/CmsStringMessageConverter.java
@@ -41,9 +41,11 @@ public class CmsStringMessageConverter extends AbstractHttpMessageConverter<Sign
 
     public static final MediaType CONTENT_TYPE_CMS_TEXT = new MediaType("application", "cms-text");
     public static final String CONTENT_TYPE_CMS_TEXT_VALUE = "application/cms-text";
+    public static final MediaType CONTENT_TYPE_CMS = new MediaType("application", "cms");
+    public static final String CONTENT_TYPE_CMS_VALUE = "application/cms";
 
     public CmsStringMessageConverter() {
-        super(CONTENT_TYPE_CMS_TEXT);
+        super(CONTENT_TYPE_CMS_TEXT, CONTENT_TYPE_CMS);
     }
 
     @Override
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleIntegrationTest.java b/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleIntegrationTest.java
index d64f64eb..42afa8ca 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleIntegrationTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleIntegrationTest.java
@@ -146,7 +146,7 @@ void testSuccessfulUpload() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -232,7 +232,7 @@ void testJsonSchemaValidation() throws Exception {
 
             mockMvc.perform(post("/rules")
                 .content(payload)
-                .contentType("application/cms-text")
+                .contentType("application/cms")
                 .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
                 .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
             )
@@ -258,7 +258,7 @@ void testValidationCountry() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -274,7 +274,7 @@ void testValidationCountry() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -298,7 +298,7 @@ void testValidationVersion() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -306,7 +306,7 @@ void testValidationVersion() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -322,7 +322,7 @@ void testValidationVersion() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -345,7 +345,7 @@ void testValidationUploadCert() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -370,7 +370,7 @@ void testValidationTimestamps() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -386,7 +386,7 @@ void testValidationTimestamps() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -402,7 +402,7 @@ void testValidationTimestamps() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -418,7 +418,7 @@ void testValidationTimestamps() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -444,7 +444,7 @@ void testValidationTimestamps2() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -460,7 +460,7 @@ void testValidationTimestamps2() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -487,7 +487,7 @@ void testValidationTimestamps3() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -512,7 +512,7 @@ void testValidationRuleId() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -529,7 +529,7 @@ void testValidationRuleId() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -546,7 +546,7 @@ void testValidationRuleId() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -562,7 +562,7 @@ void testValidationRuleId() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -586,7 +586,7 @@ void testValidationRuleInvalidIdPrefix() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -603,7 +603,7 @@ void testValidationRuleInvalidIdPrefix() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -620,7 +620,7 @@ void testValidationRuleInvalidIdPrefix() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -637,7 +637,7 @@ void testValidationRuleInvalidIdPrefix() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -663,7 +663,7 @@ void testDelete() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -678,7 +678,7 @@ void testDelete() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -693,7 +693,7 @@ void testDelete() throws Exception {
 
         mockMvc.perform(delete("/rules")
             .content(deletePayload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -716,7 +716,7 @@ void testDeleteFailNotFound() throws Exception {
 
         mockMvc.perform(delete("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -737,7 +737,7 @@ void testDeleteFailInvalidUploadCertificate() throws Exception {
 
         mockMvc.perform(delete("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -759,7 +759,7 @@ void testDeleteFailInvalidIdString() throws Exception {
 
         mockMvc.perform(delete("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -781,7 +781,7 @@ void testDeleteFailInvalidCountryCode() throws Exception {
 
         mockMvc.perform(delete("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -1043,7 +1043,7 @@ void testDeleteAliasEndpoint() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -1058,7 +1058,7 @@ void testDeleteAliasEndpoint() throws Exception {
 
         mockMvc.perform(post("/rules")
             .content(payload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -1073,7 +1073,7 @@ void testDeleteAliasEndpoint() throws Exception {
 
         mockMvc.perform(post("/rules/delete")
             .content(deletePayload)
-            .contentType("application/cms-text")
+            .contentType("application/cms")
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
             .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
         )
@@ -1082,4 +1082,46 @@ void testDeleteAliasEndpoint() throws Exception {
         Assertions.assertEquals(validationRulesInDb, validationRuleRepository.count());
     }
 
+    @Test
+    void testSuccessfulUploadWithOldContentType() throws Exception {
+        long validationRulesInDb = validationRuleRepository.count();
+        long auditEventEntitiesInDb = auditEventRepository.count();
+
+        X509Certificate signerCertificate = trustedPartyTestHelper.getCert(TrustedPartyEntity.CertificateType.UPLOAD, countryCode);
+        PrivateKey signerPrivateKey = trustedPartyTestHelper.getPrivateKey(TrustedPartyEntity.CertificateType.UPLOAD, countryCode);
+
+        ValidationRule validationRule = getDummyValidationRule();
+
+        String payload = new SignedStringMessageBuilder()
+            .withSigningCertificate(certificateUtils.convertCertificate(signerCertificate), signerPrivateKey)
+            .withPayload(objectMapper.writeValueAsString(validationRule))
+            .buildAsString();
+
+        String authCertHash = trustedPartyTestHelper.getHash(TrustedPartyEntity.CertificateType.AUTHENTICATION, countryCode);
+
+        mockMvc.perform(post("/rules")
+            .content(payload)
+            .contentType("application/cms-text")
+            .header(dgcConfigProperties.getCertAuth().getHeaderFields().getThumbprint(), authCertHash)
+            .header(dgcConfigProperties.getCertAuth().getHeaderFields().getDistinguishedName(), authCertSubject)
+        )
+            .andExpect(status().isCreated());
+
+        Assertions.assertEquals(validationRulesInDb + 1, validationRuleRepository.count());
+        Optional<ValidationRuleEntity> createdValidationRule =
+            validationRuleRepository.getByRuleIdAndVersion(validationRule.getIdentifier(), validationRule.getVersion());
+
+        Assertions.assertTrue(createdValidationRule.isPresent());
+
+        Assertions.assertEquals(auditEventEntitiesInDb + 1, auditEventRepository.count());
+        Assertions.assertEquals(validationRule.getValidFrom().toEpochSecond(), createdValidationRule.get().getValidFrom().toEpochSecond());
+        Assertions.assertEquals(validationRule.getValidTo().toEpochSecond(), createdValidationRule.get().getValidTo().toEpochSecond());
+        Assertions.assertEquals(validationRule.getCountry(), createdValidationRule.get().getCountry());
+        Assertions.assertEquals(validationRule.getType().toUpperCase(Locale.ROOT), createdValidationRule.get().getValidationRuleType().toString());
+
+        SignedStringMessageParser parser = new SignedStringMessageParser(createdValidationRule.get().getCms());
+        ValidationRule parsedValidationRule = objectMapper.readValue(parser.getPayload(), ValidationRule.class);
+
+        assertEquals(validationRule, parsedValidationRule);
+    }
 }