diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 591f5f1..f2f941e 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -12,3 +12,4 @@
         engine: pkg
       command_timeout: 5
       worker_threads: 3
+      max_event_size: 100000000
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 80334b1..7435070 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -14,4 +14,5 @@
         engine: pkg
       command_timeout: 5
       worker_threads: 3
+      max_event_size: 100000000
       base_environment: ${_param:salt_master_base_environment}
diff --git a/metadata/service/minion/cluster.yml b/metadata/service/minion/cluster.yml
index 91aaaaa..690e5a3 100644
--- a/metadata/service/minion/cluster.yml
+++ b/metadata/service/minion/cluster.yml
@@ -6,6 +6,7 @@
   salt:
     minion:
       enabled: true
+      max_event_size: 100000000
       source:
         engine: pkg
       masters:
diff --git a/metadata/service/minion/local.yml b/metadata/service/minion/local.yml
index 93d7772..961cb1e 100644
--- a/metadata/service/minion/local.yml
+++ b/metadata/service/minion/local.yml
@@ -6,6 +6,7 @@
   salt:
     minion:
       enabled: true
+      max_event_size: 100000000
       source:
         engine: pkg
       local: true
diff --git a/metadata/service/minion/master.yml b/metadata/service/minion/master.yml
index 3a8561a..f3531a5 100644
--- a/metadata/service/minion/master.yml
+++ b/metadata/service/minion/master.yml
@@ -6,6 +6,7 @@
   salt:
     minion:
       enabled: true
+      max_event_size: 100000000
       source:
         engine: pkg
       master:
diff --git a/salt/files/master.conf b/salt/files/master.conf
index 2ee44d9..40a38f5 100644
--- a/salt/files/master.conf
+++ b/salt/files/master.conf
@@ -44,6 +44,10 @@
 auto_accept: True
 {%- endif %}
 
+{%- if master.get('max_event_size') %}
+max_event_size: {{ master.max_event_size }}
+{%- endif %}
+
 {%- if master.pillar.engine == 'salt' %}
 
 pillar_roots:
diff --git a/salt/files/minion.conf b/salt/files/minion.conf
index 099bccc..d44a661 100644
--- a/salt/files/minion.conf
+++ b/salt/files/minion.conf
@@ -23,6 +23,10 @@
 
 id: {{ system.name }}.{{ system.domain }}
 
+{% if minion.get('max_event_size') %}
+max_event_size: {{ minion.max_event_size }}
+{%- endif %}
+
 {%- set excluded_keys = ('master', 'system', 'public_keys', 'private_keys', 'known_hosts', '__reclass__', '_secret', '_param') %}
 
 grains:
diff --git a/salt/map.jinja b/salt/map.jinja
index 874e161..097db7e 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -21,6 +21,7 @@
     files: /srv/salt/env
   pillar:
     engine: salt
+  max_event_size: 100000000
 {%- endload %}
 
 {%- load_yaml as master_specific %}
@@ -83,6 +84,7 @@
   {%- if pillar.salt.get('minion', {}).get('source', {}).version is defined %}
   version: {{ pillar.salt.minion.source.version }}
   {%- endif %}
+  max_event_size: 100000000
 {%- endload %}
 
 {%- load_yaml as minion_specific %}