diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index ecbea8dc..709b708d 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -217,7 +217,7 @@ services:
   # Optional services
   {% if antivirus_enabled %}
   antivirus:
-    image: clamav/clamav-debian:1.4.1-16
+    image: clamav/clamav-debian:1.4
     restart: always
     logging:
       driver: journald
diff --git a/towncrier/newsfragments/3735.bugfix b/towncrier/newsfragments/3735.bugfix
new file mode 100644
index 00000000..25e0d444
--- /dev/null
+++ b/towncrier/newsfragments/3735.bugfix
@@ -0,0 +1,7 @@
+Place ClamAV files under `mailu/clamav` instead of `mailu/filter/clamav` such that they can be modified by ClamAV
+itself.
+
+Users will want to change their `docker-compose.yml` accordingly and remove `mailu/filter/clamav` after upgrade.
+
+Also ClamAV image tag increased to `1.4` instead of specific (older) release, users will need to update it manually as
+well and keep it updated over time.