diff --git a/library/roles/clamav/defaults/main.yml b/library/roles/clamav/defaults/main.yml
index bf7c1bdb..acacfcb0 100644
--- a/library/roles/clamav/defaults/main.yml
+++ b/library/roles/clamav/defaults/main.yml
@@ -27,6 +27,7 @@ clamav_clamd_extended_info: 'yes'
 clamav_clamd_pidfile: '/run/clamd.scan/clamd.pid'
 clamav_clamd_tmp: '/var/tmp'
 clamav_clamd_official_db_only: 'no'
+clamav_clamd_alert_exceeding_max: 'no'
 clamav_clamd_use_local_socket: True
 clamav_clamd_local_socket: '/run/clamd.scan/clamd.sock'
 clamav_clamd_use_net_socket: False
diff --git a/library/roles/clamav/templates/scan.conf.j2 b/library/roles/clamav/templates/scan.conf.j2
index 8d814f26..59e4b66a 100644
--- a/library/roles/clamav/templates/scan.conf.j2
+++ b/library/roles/clamav/templates/scan.conf.j2
@@ -451,7 +451,7 @@ MaxScanSize {{ clamav_clamd_stream_max_lenght }}M
 # Note: disabling this limit or setting it too high may result in severe damage
 # to the system.
 # Default: 25M
-#MaxFileSize 30M
+MaxFileSize {{ clamav_clamd_stream_max_lenght }}M
 
 # Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
 # file, all files within it will also be scanned. This options specifies how
@@ -566,7 +566,7 @@ MaxRecursion 10
 # MaxRecursion limit will be flagged with the virus
 # "Heuristics.Limits.Exceeded".
 # Default: no
-AlertExceedsMax yes
+AlertExceedsMax {{ clamav_clamd_alert_exceeding_max }}
 
 ##
 ## On-access Scan Settings