diff --git a/tasks/install_clamav.yml b/tasks/install_clamav.yml
index bdb43ff42f8df541ad9d5b29ecd252e7d5d4e9e3..922903e71ad4dfd20cf367b5cfb5f546fedc0513 100644
--- a/tasks/install_clamav.yml
+++ b/tasks/install_clamav.yml
@@ -164,7 +164,16 @@
 
 - name: wait for signature file to appear
   ansible.builtin.wait_for:
-    path: "/var/lib/clamav/daily.cld"
+    path: "/var/lib/clamav/{{ item }}"
+    timeout: 600   # Maximum number of seconds to wait for
+  loop:
+    - "bytecode.cvd"    # compiled bytecode signatures evaluated by the
+                        # bytecode interpreter engine
+    # - "daily.cld"     # signatures for the latest threats (updated daily)
+                        # We don't wait for these, because they might not exist
+                        # on a fresh installation.
+    - "main.cvd"        # signatures previously in daily.cvd that have shown to
+                        # have a low false-positive risk.
   when: ansible_os_family == "RedHat"
 
 - name: find out if unnecessary systemd service exists