diff --git a/data/Dockerfiles/clamav/Dockerfile b/data/Dockerfiles/clamav/Dockerfile
index 335e9ae5..48edeae1 100755
--- a/data/Dockerfiles/clamav/Dockerfile
+++ b/data/Dockerfiles/clamav/Dockerfile
@@ -1,27 +1,21 @@
 FROM alpine:3.6
 
-LABEL maintainer "https://m-ko.de Markus Kosmal <code@cnfg.io>"
+LABEL maintainer "André Peters <andre.peters@servercow.de>"
 
 # Add scripts
 COPY dl_files.sh bootstrap.sh ./
 
-# Install Dependencies
+# Installation
 RUN apk add --update \
-&& apk add --no-cache clamav clamav-libunrar curl bash \
-\
-# Update AV databases
-&& chmod +x dl_files.sh \
-&& set -ex; /dl_files.sh \
-\
-# Setup run
-&& mkdir /run/clamav \
-&& chown clamav:clamav /run/clamav \
-&& chmod 750 /run/clamav \
-\
-# AV configuration
-&& sed -i '/Foreground yes/s/^#//g' /etc/clamav/clamd.conf \
-&& sed -i '/TCPSocket 3310/s/^#//g' /etc/clamav/clamd.conf \
-&& sed -i '/Foreground yes/s/^#//g' /etc/clamav/freshclam.conf
+	&& apk add --no-cache clamav clamav-libunrar curl bash \
+	&& chmod +x /dl_files.sh \
+	&& set -ex; /bin/bash /dl_files.sh \
+	&& mkdir /run/clamav \
+	&& chown clamav:clamav /run/clamav \
+	&& chmod 750 /run/clamav \
+	&& sed -i '/Foreground yes/s/^#//g' /etc/clamav/clamd.conf \
+	&& sed -i '/TCPSocket 3310/s/^#//g' /etc/clamav/clamd.conf \
+	&& sed -i '/Foreground yes/s/^#//g' /etc/clamav/freshclam.conf
 
 # Port provision
 EXPOSE 3310