diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/RevokedCertDataService.java b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/RevokedCertDataService.java
index 64ab5eb4..05bce319 100644
--- a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/RevokedCertDataService.java
+++ b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/RevokedCertDataService.java
@@ -13,11 +13,12 @@
 import ch.admin.bag.covidcertificate.backend.verifier.model.DbRevokedCert;
 import ch.admin.bag.covidcertificate.backend.verifier.model.cert.db.RevokedCertsUpdateResponse;
 import java.util.List;
+import java.util.Set;
 
 public interface RevokedCertDataService {
 
     /** upserts the given revoked uvcis into the db */
-    public RevokedCertsUpdateResponse replaceRevokedCerts(List<String> revokedUvcis);
+    public RevokedCertsUpdateResponse replaceRevokedCerts(Set<String> revokedUvcis);
 
     /** returns the next batch of revoked certs after `since` */
     public List<DbRevokedCert> findRevokedCerts(Long since);
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/impl/JdbcRevokedCertDataServiceImpl.java b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/impl/JdbcRevokedCertDataServiceImpl.java
index b38aa4db..dfdfda93 100644
--- a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/impl/JdbcRevokedCertDataServiceImpl.java
+++ b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-data/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/data/impl/JdbcRevokedCertDataServiceImpl.java
@@ -14,9 +14,12 @@
 import ch.admin.bag.covidcertificate.backend.verifier.data.mapper.RevokedCertRowMapper;
 import ch.admin.bag.covidcertificate.backend.verifier.model.DbRevokedCert;
 import ch.admin.bag.covidcertificate.backend.verifier.model.cert.db.RevokedCertsUpdateResponse;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javax.sql.DataSource;
+import org.apache.commons.collections4.ListUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -45,30 +48,40 @@ public JdbcRevokedCertDataServiceImpl(DataSource dataSource, int revokedCertBatc
 
     @Transactional(readOnly = false)
     @Override
-    public RevokedCertsUpdateResponse replaceRevokedCerts(List<String> revokedUvcis) {
-        int insertCount = insertNewRevokedCerts(revokedUvcis);
-        int removeCount = removeRevokedCertsNotIn(revokedUvcis);
+    public RevokedCertsUpdateResponse replaceRevokedCerts(Set<String> revokedUvcis) {
+        Set<String> existingUvcis = findAllRevokedUvcis();
+        int insertCount = insertNewRevokedCerts(revokedUvcis, existingUvcis);
+        int removeCount = removeRevokedCertsNotIn(revokedUvcis, existingUvcis);
         return new RevokedCertsUpdateResponse(insertCount, removeCount);
     }
 
-    private int insertNewRevokedCerts(List<String> revokedUvcis) {
+    private int insertNewRevokedCerts(Set<String> revokedUvcis, Set<String> existingUvcis) {
         if (revokedUvcis != null && !revokedUvcis.isEmpty()) {
-            List<String> existingUvcis =
-                    jt.queryForList(
-                            "select uvci from t_revoked_cert",
-                            new MapSqlParameterSource(),
-                            String.class);
             List<String> toInsert =
                     revokedUvcis.stream()
                             .filter(uvci -> !existingUvcis.contains(uvci))
                             .collect(Collectors.toList());
-            revokedCertInsert.executeBatch(createParams(toInsert));
+
+            // insert in batches
+            final int maxBatchSize = 10000;
+            for (List<String> batchToInsert : ListUtils.partition(toInsert, maxBatchSize)) {
+                revokedCertInsert.executeBatch(createParams(batchToInsert));
+            }
+
             return toInsert.size();
         } else {
             return 0;
         }
     }
 
+    private Set<String> findAllRevokedUvcis() {
+        return new HashSet<>(
+                jt.queryForList(
+                        "select distinct uvci from t_revoked_cert",
+                        new MapSqlParameterSource(),
+                        String.class));
+    }
+
     private MapSqlParameterSource[] createParams(List<String> revokedUvcis) {
         if (revokedUvcis == null) {
             return null;
@@ -82,12 +95,27 @@ private MapSqlParameterSource[] createParams(List<String> revokedUvcis) {
         return params;
     }
 
-    private int removeRevokedCertsNotIn(List<String> revokedUvcis) {
+    private int removeRevokedCertsNotIn(Set<String> uvcisToKeep, Set<String> existingUvcis) {
         String sql = "delete from t_revoked_cert";
-        if (revokedUvcis != null && !revokedUvcis.isEmpty()) {
-            sql += " where uvci not in (:to_keep)";
+        if (uvcisToKeep != null && !uvcisToKeep.isEmpty()) {
+            sql += " where uvci in (:to_delete)";
+
+            List<String> toDelete =
+                    existingUvcis.stream()
+                            .filter(uvci -> !uvcisToKeep.contains(uvci))
+                            .collect(Collectors.toList());
+
+            // delete in batches
+            int deleteCount = 0;
+            final int maxBatchSize = 10000;
+            for (List<String> batchToDelete : ListUtils.partition(toDelete, maxBatchSize)) {
+                deleteCount +=
+                        jt.update(sql, new MapSqlParameterSource("to_delete", batchToDelete));
+            }
+            return deleteCount;
+        } else {
+            return jt.update(sql, new MapSqlParameterSource());
         }
-        return jt.update(sql, new MapSqlParameterSource("to_keep", revokedUvcis));
     }
 
     @Transactional(readOnly = true)
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/client/RevocationListSyncer.java b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/client/RevocationListSyncer.java
index f64dc653..6298bb33 100644
--- a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/client/RevocationListSyncer.java
+++ b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/client/RevocationListSyncer.java
@@ -12,9 +12,9 @@
 
 import ch.admin.bag.covidcertificate.backend.verifier.data.RevokedCertDataService;
 import ch.admin.bag.covidcertificate.backend.verifier.model.cert.db.RevokedCertsUpdateResponse;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,28 +42,30 @@ public void updateRevokedCerts() {
         logger.info("updating revoked certs");
 
         try {
-            List<String> revokedCerts = downloadRevokedCerts();
+            long start = System.currentTimeMillis();
+            Set<String> revokedCerts = downloadRevokedCerts();
             logger.info("downloaded {} revoked certs", revokedCerts.size());
 
             RevokedCertsUpdateResponse updateResponse =
                     revokedCertDataService.replaceRevokedCerts(revokedCerts);
 
             logger.info(
-                    "finished updating revoked certs. inserted {}, removed {}",
+                    "finished updating revoked certs. inserted {}, removed {}. took {}ms",
                     updateResponse.getInsertCount(),
-                    updateResponse.getRemoveCount());
+                    updateResponse.getRemoveCount(),
+                    System.currentTimeMillis() - start);
         } catch (Exception e) {
             logger.error("revoked certs update failed", e);
         }
     }
 
-    private List<String> downloadRevokedCerts() {
+    private Set<String> downloadRevokedCerts() {
         final var requestEndpoint = baseurl + endpoint;
         final var uri = UriComponentsBuilder.fromHttpUrl(requestEndpoint).build().toUri();
         final RequestEntity<Void> requestEntity =
                 RequestEntity.get(uri).headers(createDownloadHeaders()).build();
         final var response = rt.exchange(requestEntity, String[].class).getBody();
-        return new ArrayList<>(Arrays.asList(response));
+        return new HashSet<>(Arrays.asList(response));
     }
 
     private HttpHeaders createDownloadHeaders() {
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/config/SchedulingConfig.java b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/config/SchedulingConfig.java
index 9b580cdc..1a857e52 100644
--- a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/config/SchedulingConfig.java
+++ b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/config/SchedulingConfig.java
@@ -41,8 +41,8 @@ public void syncRevocationListOnStartup() {
         revocationListSyncer.updateRevokedCerts();
     }
 
-    // Sync revocation list every full hour (default)
-    @Scheduled(cron = "${revocationList.sync.cron:0 0 * ? * *}")
+    // Sync revocation list every 5 minutes from the full hour (default)
+    @Scheduled(cron = "${revocationList.sync.cron:0 0/5 * ? * *}")
     @SchedulerLock(name = "revocation_list_sync", lockAtLeastFor = "PT15S")
     public void syncRevocationList() {
         LockAssert.assertLocked();
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/controller/dev/DevController.java b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/controller/dev/DevController.java
index 9fba4ec6..9fdead2d 100644
--- a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/controller/dev/DevController.java
+++ b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/ws/controller/dev/DevController.java
@@ -27,7 +27,7 @@ public class DevController {
     @GetMapping(value = "/v1/revocation-list")
     public @ResponseBody ResponseEntity<List<String>> getMockRevokedCerts() {
         List<String> response = new ArrayList<>();
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 100010; i++) {
             response.add("urn:uvci:01:CH:MOCK" + i);
         }
         return ResponseEntity.ok(response);
diff --git a/ch-covidcertificate-backend-verifier/pom.xml b/ch-covidcertificate-backend-verifier/pom.xml
index 15ba316a..919023f9 100644
--- a/ch-covidcertificate-backend-verifier/pom.xml
+++ b/ch-covidcertificate-backend-verifier/pom.xml
@@ -71,6 +71,11 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>