diff --git a/clamd/Dockerfile b/clamd/Dockerfile
index 06e8b54f6d6ce2cc677612595b27b89da5936034..3b45d510856478ec421ec2fda5dca0cb466d5914 100644
--- a/clamd/Dockerfile
+++ b/clamd/Dockerfile
@@ -8,13 +8,14 @@ RUN apt-get update && \
         procps \
     && \
     freshclam --verbose --stdout && \
+    install -d -m 755 -o clamav -g clamav /run/clamav && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
 COPY --chown=root:root clamd.conf /etc/clamav/
 RUN clamconf -n
-COPY --chown=root:root entrypoint /entrypoint
-COPY --chown=root:root clamd-ping clamd-update /usr/local/bin/
+COPY --chown=root:root clamd-ping /usr/local/bin/
+COPY --chown=root:root clamd-update /usr/local/bin/
+USER clamav
+WORKDIR /var/lib/clamav
 EXPOSE 3310
-VOLUME /run/clamav
-ENTRYPOINT [ "/entrypoint" ]
 CMD [ "clamd" ]
 HEALTHCHECK CMD clamd-ping
diff --git a/clamd/entrypoint b/clamd/entrypoint
deleted file mode 100755
index 3c77c8646fed6585505dc0117e0cd50a252ca0b4..0000000000000000000000000000000000000000
--- a/clamd/entrypoint
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eux
-
-install -d -m 755 -o clamav -g clamav /run/clamav
-
-eval exec "$@"