diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java
index 1f0b1943a..5e0bed358 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java
@@ -259,7 +259,7 @@ public class HawkbitSecurityProperties {
          * Maximum number of targets for an automatic distribution set
          * assignment
          */
-        private int maxTargetsPerAutoAssignment = 5000;
+        private int maxTargetsPerAutoAssignment = 20000;
 
         /**
          * Maximum size of artifacts in bytes. Defaults to 1 GB.