diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 428d6995..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.2.3-45
+    image: clamav/clamav-debian:1.4
     restart: always
     logging:
       driver: journald
@@ -226,7 +226,7 @@ services:
     networks:
       - clamav
     volumes:
-      - "{{ root }}/filter/clamav:/var/lib/clamav"
+      - "{{ root }}/clamav:/var/lib/clamav"
     healthcheck:
       test: ["CMD-SHELL", "kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid`"]
       interval: 10s
diff --git a/tests/compose/filters/docker-compose.yml b/tests/compose/filters/docker-compose.yml
index 2d2562a4..b452ed79 100644
--- a/tests/compose/filters/docker-compose.yml
+++ b/tests/compose/filters/docker-compose.yml
@@ -99,7 +99,7 @@ services:
     networks:
       - clamav
     volumes:
-      - "/mailu/filter/clamav:/var/lib/clamav"
+      - "/mailu/clamav:/var/lib/clamav"
     healthcheck:
       test: ["CMD-SHELL", "kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid`"]
       interval: 10s
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.