diff --git a/data/Dockerfiles/clamd/Dockerfile b/data/Dockerfiles/clamd/Dockerfile
index 6f38e359..3f1aa157 100644
--- a/data/Dockerfiles/clamd/Dockerfile
+++ b/data/Dockerfiles/clamd/Dockerfile
@@ -2,18 +2,26 @@ FROM debian:bullseye-slim
 
 LABEL maintainer "André Peters <andre.peters@servercow.de>"
 
-ARG CLAMAV=0.103.5
+ARG CLAMAV=0.104.2
+ARG TINI_VERSION=v0.19.0
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
   ca-certificates \
-  zlib1g-dev \
-  libcurl4-openssl-dev \
-  libncurses5-dev \
-  libzip-dev \
-  libpcre2-dev \
-  libxml2-dev \
-  libssl-dev \
   build-essential \
+  pkg-config \
+  python3 \
+  python3-pip \
+  valgrind \
+  check \
+  libbz2-dev \
+  libcurl4-openssl-dev \
   libjson-c-dev \
+  libmilter-dev \
+  libncurses5-dev \
+  libpcre2-dev \
+  libssl-dev \
+  libxml2-dev \
+  zlib1g-dev \
   curl \
   bash \
   wget \
@@ -22,39 +30,47 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   rsync \
   dos2unix \
   netcat \
+  && python3 -m pip install cmake \
   && rm -rf /var/lib/apt/lists/* \
   && wget -O - https://www.clamav.net/downloads/production/clamav-${CLAMAV}.tar.gz | tar xfvz - \
   && cd clamav-${CLAMAV} \
-  && ./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib \
-  --sysconfdir=/etc/clamav \
-  --mandir=/usr/share/man \
-  --infodir=/usr/share/info \
-  --disable-llvm \
-  --with-user=clamav \
-  --with-group=clamav \
-  --with-dbdir=/var/lib/clamav \
-  --enable-clamdtop \
-  --enable-bigstack \
-  --with-pcre \
-  && make -j4 \
-  && make install \
-  && make clean \
+  && cmake . \
+      -D CMAKE_INSTALL_PREFIX=/usr \
+      -D CMAKE_INSTALL_LIBDIR=/usr/lib \
+      -D APP_CONFIG_DIRECTORY=/etc/clamav \
+      -D CMAKE_INSTALL_MANDIR=/usr/share/man \
+      -D CMAKE_INSTALL_INFODIR=/usr/share/info \
+      -D CLAMAV_USER=clamav \
+      -D CLAMAV_GROUP=clamav \
+      -D DATABASE_DIRECTORY=/var/lib/clamav \
+      -D ENABLE_APP=ON \
+      -D ENABLE_JSON_SHARED=OFF \
+      -D CMAKE_BUILD_TYPE=MinSizeRel \
+  && cmake --build . -j4 \
+  && cmake --build . --target install \
   && cd .. && rm -rf clamav-${CLAMAV} \
   && apt-get -y --auto-remove purge build-essential \
-  && apt-get -y purge zlib1g-dev \
-  libncurses5-dev \
-  libzip-dev \
-  libpcre2-dev \
-  libxml2-dev \
-  libssl-dev \
+  && apt-get -y purge pkg-config \
+  python3 \
+  python3-pip \
+  valgrind \
+  check \
+  libbz2-dev \
+  libcurl4-openssl-dev \
   libjson-c-dev \
+  libmilter-dev \
+  libncurses5-dev \
+  libpcre2-dev \
+  libssl-dev \
+  libxml2-dev \
+  zlib1g-dev \
+
   && addgroup --system --gid 700 clamav \
   && adduser --system --no-create-home --home /var/lib/clamav --uid 700 --gid 700 --disabled-login clamav \
   && rm -rf /tmp/* /var/tmp/*
 
 COPY clamd.sh ./
-COPY tini /sbin/tini
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
+RUN chmod +x /sbin/tini
 
 CMD ["/sbin/tini", "-g", "--", "/clamd.sh"]
diff --git a/data/Dockerfiles/clamd/tini b/data/Dockerfiles/clamd/tini
deleted file mode 100755
index 03af82f0..00000000
Binary files a/data/Dockerfiles/clamd/tini and /dev/null differ
diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile
index 06cc7f2c..68fb7332 100644
--- a/data/Dockerfiles/dovecot/Dockerfile
+++ b/data/Dockerfiles/dovecot/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:bullseye-slim
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG DOVECOT=2.3.17.1
+ARG DOVECOT=2.3.18
 ENV LC_ALL C
 ENV GOSU_VERSION 1.14
 
diff --git a/data/web/lang/lang.es.json b/data/web/lang/lang.es.json
index 87be8b4d..098dfa2c 100644
--- a/data/web/lang/lang.es.json
+++ b/data/web/lang/lang.es.json
@@ -18,7 +18,8 @@
         "spam_score": "Puntuación de spam",
         "syncjobs": "Trabajos de sincronización",
         "tls_policy": "Póliza de TLS",
-        "unlimited_quota": "Cuota ilimitada para buzones"
+        "unlimited_quota": "Cuota ilimitada para buzones",
+        "app_passwds": "Gestionar las contraseñas de aplicaciones"
     },
     "add": {
         "activate_filter_warn": "Todos los demás filtros se desactivarán cuando este filtro se active.",
diff --git a/docker-compose.yml b/docker-compose.yml
index e787f514..56147f98 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,7 @@ services:
             - redis
 
     clamd-mailcow:
-      image: mailcow/clamd:1.43
+      image: mailcow/clamd:1.44
       restart: always
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
@@ -212,7 +212,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.159
+      image: mailcow/dovecot:1.160
       depends_on:
         - mysql-mailcow
       dns: