diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 9a6aa99..2724f8f 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -5,33 +5,30 @@ RUN <<EOF
 export DEBIAN_FRONTEND=noninteractive 
 export TZ=Europe/Berlin 
 apt-get update
-apt-get install -y tzdata wget gnupg apache2
-EOF
-RUN <<EOF
+apt-get install -y --no-install-recommends tzdata wget gnupg apache2
 # install php7-mapi and dependencies
 wget --no-verbose -P/tmp http://bldr/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz 
 tar xzf /tmp/core-11.0.2.50.507cbae-Ubuntu_20.04-amd64.tar.gz
 for F in core-11.0.2.50.507cbae-Ubuntu_20.04-amd64/*.deb; do dpkg --unpack --no-triggers $F; done
-apt-get install -f -y
+apt-get install -f -y --no-install-recommends
 # install kopano-webapp
 wget --no-verbose -P/tmp http://bldr/webapp-6.0.0.57.1049268-Ubuntu_20.04-all.tar.gz
 tar xzf /tmp/webapp-6.0.0.57.1049268-Ubuntu_20.04-all.tar.gz
 for F in webapp-6.0.0.57.1049268-Ubuntu_20.04-all/*.deb; do dpkg --unpack --no-triggers $F; done
-apt-get install -f -y
+apt-get install -f -y  --no-install-recommends
+apt-get install -y --no-install-recommends libapache2-mod-php7.4
+a2ensite kopano-webapp
+apt-get autoclean
+rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
+rm -rf webapp-6.0.0.57.1049268-Ubuntu_20.04-all
+rm -rf core-11.0.2.50.507cbae-Ubuntu_20.04-amd64
 EOF
-# RUN <<EOF
-# apt-get autoclean
-# rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache ~/.npm
-# rm -rf webapp-6.0.0.57.1049268-Ubuntu_20.04-all
-# rm -rf core-11.0.2.50.507cbae-Ubuntu_20.04-amd64
-# EOF
 # use envsubst in entrypoint script to convert config templates to actual config files
 RUN <<EOF
-apt-get install -y libapache2-mod-php7.4
-a2ensite kopano-webapp
 # phpenmod kopano
-# sed -i -e's/^;session.cookie_secure =/session.cookie_secure = false/' /etc/php/7.4/apache2/php.ini
 sed -i -e's/define("SECURE_COOKIES", true);/define("SECURE_COOKIES", false);/' /etc/kopano/webapp/config.php
 EOF
+COPY --chmod=0775 entrypoint.sh /entrypoint.sh
 EXPOSE 80
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["apache2", "-DFOREGROUND"]
\ No newline at end of file
diff --git a/webapp/build.sh b/webapp/build.sh
index e0d8b6c..635b1ae 100644
--- a/webapp/build.sh
+++ b/webapp/build.sh
@@ -2,14 +2,9 @@
 # export DOCKER_BUILDKIT=1
 docker run -d --rm --name www -p80:80 -v/root/kopano-docker/dist:/usr/local/apache2/htdocs httpd
 docker build --no-cache --progress=plain -t webapp .
+docker build -t webapp .
 docker run --rm -it --name webapp \
   -p8080:80 \
-  -e "MAIL_DOMAIN=ads65.de" \
-  -e "APACHE_RUN_DIR=/var/www" \
-  -e "APACHE_RUN_USER=www-data" \
-  -e "APACHE_RUN_GROUP=www-data" \
-  -e "APACHE_LOG_DIR=/var/log/apache2" \
-  -e "APACHE_PID_FILE=/var/run/apache2/apache2.pid" \
   webapp 
 docker logs -f webapp
 docker exec -it webapp bash
diff --git a/webapp/entrypoint.sh b/webapp/entrypoint.sh
new file mode 100644
index 0000000..d0769c7
--- /dev/null
+++ b/webapp/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+export MAIL_DOMAIN=ads65.de
+export APACHE_RUN_DIR=/var/www
+export APACHE_RUN_USER=www-data
+export APACHE_RUN_GROUP=www-data
+export APACHE_LOG_DIR=/var/log/apache2
+export APACHE_PID_FILE=/var/run/apache2/apache2.pid
+exec "$@"