diff --git a/roles/clamav/templates/clamscan.sh.j2 b/roles/clamav/templates/clamscan.sh.j2
index 0c521806f5..afe94cb279 100644
--- a/roles/clamav/templates/clamscan.sh.j2
+++ b/roles/clamav/templates/clamscan.sh.j2
@@ -9,8 +9,15 @@ DAYS=7
 TMPCLAMDIR=$(mktemp -d clamav_ansible.XXXXXX)
 FILELIST="$TMPCLAMDIR/clamscan_filelist.$$"
 
+clean_tmp_files() {
+    rm -f $FILELIST
+    rmdir $TMPCLAMDIR
+}
+trap clean_tmp_files EXIT
+
 rm -f $LOGFILE
 
+
 # Build file list to scan
 {% for path in clamscan_paths %}
 find {{ path }} -ctime -${DAYS} -type f >> $FILELIST
@@ -34,4 +41,3 @@ then
     mail -s "Virus scanning error on $(hostname)" $MAILTO -- < $LOGFILE
 fi
 
-rm -f $FILELIST