diff --git a/.gitignore b/.gitignore
index f858422d..2f87e3e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ data/web/inc/vars.local.inc.php
 data/assets/ssl/*
 .vscode/*
 data/web/.well-known/acme-challenge
-data/web/nextcloud/
+data/web/nextcloud*/
 data/conf/rspamd/local.d/*
 data/conf/rspamd/override.d/*
 !data/conf/nginx/dynmaps.conf
diff --git a/data/Dockerfiles/clamd/Dockerfile b/data/Dockerfiles/clamd/Dockerfile
index 69e7307c..f4d4765c 100644
--- a/data/Dockerfiles/clamd/Dockerfile
+++ b/data/Dockerfiles/clamd/Dockerfile
@@ -52,9 +52,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libssl-dev \
   libjson-c-dev \
   && addgroup --system --gid 700 clamav \
-  && adduser --system --home /var/lib/clamav --uid 700 --gid 700 --disabled-login clamav \
-  && mkdir -p /run/clamav \
-  && chown clamav:clamav /run/clamav \
+  && adduser --system --no-create-home --home /var/lib/clamav --uid 700 --gid 700 --disabled-login clamav \
+  && mkdir -p /run/clamav /var/lib/clamav \
+  && chown clamav:clamav /run/clamav /var/lib/clamav \
   && chmod 750 /run/clamav \
   && rm -rf /tmp/* /var/tmp/*
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dbac97be..0216e4f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,7 +55,7 @@ services:
             - redis
 
     clamd-mailcow:
-      image: mailcow/clamd:1.17
+      image: mailcow/clamd:1.18
       build: ./data/Dockerfiles/clamd
       restart: always
       environment: