diff --git a/src/main/java/eu/europa/ec/dgc/gateway/config/DgcConfigProperties.java b/src/main/java/eu/europa/ec/dgc/gateway/config/DgcConfigProperties.java
index 65c2574b..48bbb2f4 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/config/DgcConfigProperties.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/config/DgcConfigProperties.java
@@ -151,6 +151,7 @@ public static class HeaderFields {
     @Setter
     public static class Revocation {
         private int deleteThreshold = 14;
+        private Boolean enabled;
     }
 
     @Getter
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
index 68a53877..bbb97245 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
@@ -70,7 +70,7 @@
 @RequiredArgsConstructor
 @Validated
 @Slf4j
-@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "dgc.revocation.enabled", havingValue = "true")
 public class CertificateRevocationListController {
 
     private final RevocationListService revocationListService;
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListCleanUpService.java b/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListCleanUpService.java
index e154a76e..3e166171 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListCleanUpService.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListCleanUpService.java
@@ -33,7 +33,7 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "dgc.revocation.enabled", havingValue = "true")
 public class RevocationListCleanUpService {
 
     private final RevocationBatchRepository revocationBatchRepository;
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListService.java b/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListService.java
index 174229b6..ae6ed318 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListService.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListService.java
@@ -58,7 +58,7 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "dgc.revocation.enabled", havingValue = "true")
 public class RevocationListService {
 
     private static final int MAX_BATCH_LIST_SIZE = 1000;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ef191da0..55930f43 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -67,6 +67,7 @@ dgc:
       pem: X-SSL-Client-Cert
   revocation:
     delete-threshold: 14
+    enabled: false
   signer-information:
     delete-threshold: 14
   trustedCertificates:
@@ -104,10 +105,7 @@ dgc:
     apiKey: 0a0a0a0a-0a0a-0a0a-0a0a-0a0a0a0a0a0a
     url: https://api.cloudmersive.com
     enabled: false
+
 springdoc:
   api-docs:
     enabled: false
-
-revocation-list:
-  controller:
-    enabled: false
\ No newline at end of file