diff --git a/2019.12/apache/Dockerfile b/2019.12/apache/Dockerfile
index 790b7819..ac047bd6 100644
--- a/2019.12/apache/Dockerfile
+++ b/2019.12/apache/Dockerfile
@@ -24,7 +24,6 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         mysql-client \
         bash \
-        $PHPIZE_DEPS \
         libpng-dev \
         libjpeg62-turbo-dev \
         libtool \
diff --git a/2019.12/apache/entrypoint.sh b/2019.12/apache/entrypoint.sh
index 8a9577f8..0eb5c756 100755
--- a/2019.12/apache/entrypoint.sh
+++ b/2019.12/apache/entrypoint.sh
@@ -23,8 +23,8 @@ setup_ssmtp() {
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
-		sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
 
 		# add possible mail-senders
 		{
diff --git a/2019.12/fpm-alpine/Dockerfile b/2019.12/fpm-alpine/Dockerfile
index 9a80dd94..6b26dbfc 100644
--- a/2019.12/fpm-alpine/Dockerfile
+++ b/2019.12/fpm-alpine/Dockerfile
@@ -7,7 +7,8 @@ RUN set -ex; \
         rsync \
         git \
 # For mail() support
-        ssmtp;
+        ssmtp \
+        shadow;
 
 # install the PHP extensions we need
 # see https://friendi.ca/resources/requirements/
diff --git a/2019.12/fpm-alpine/entrypoint.sh b/2019.12/fpm-alpine/entrypoint.sh
index 8a9577f8..0eb5c756 100755
--- a/2019.12/fpm-alpine/entrypoint.sh
+++ b/2019.12/fpm-alpine/entrypoint.sh
@@ -23,8 +23,8 @@ setup_ssmtp() {
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
-		sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
 
 		# add possible mail-senders
 		{
diff --git a/2019.12/fpm/Dockerfile b/2019.12/fpm/Dockerfile
index b123dc2b..c86e09a7 100644
--- a/2019.12/fpm/Dockerfile
+++ b/2019.12/fpm/Dockerfile
@@ -24,7 +24,6 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         mysql-client \
         bash \
-        $PHPIZE_DEPS \
         libpng-dev \
         libjpeg62-turbo-dev \
         libtool \
diff --git a/2019.12/fpm/entrypoint.sh b/2019.12/fpm/entrypoint.sh
index 8a9577f8..0eb5c756 100755
--- a/2019.12/fpm/entrypoint.sh
+++ b/2019.12/fpm/entrypoint.sh
@@ -23,8 +23,8 @@ setup_ssmtp() {
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
-		sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
 
 		# add possible mail-senders
 		{
diff --git a/2020.03-dev/apache/Dockerfile b/2020.03-dev/apache/Dockerfile
index 14244d89..0ee76a3c 100644
--- a/2020.03-dev/apache/Dockerfile
+++ b/2020.03-dev/apache/Dockerfile
@@ -24,7 +24,6 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         mysql-client \
         bash \
-        $PHPIZE_DEPS \
         libpng-dev \
         libjpeg62-turbo-dev \
         libtool \
diff --git a/2020.03-dev/apache/entrypoint-dev.sh b/2020.03-dev/apache/entrypoint-dev.sh
index 72c1c21f..55afb809 100755
--- a/2020.03-dev/apache/entrypoint-dev.sh
+++ b/2020.03-dev/apache/entrypoint-dev.sh
@@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 	fi
 fi
 
-/entrypoint.sh "$@"
+exec /entrypoint.sh "$@"
diff --git a/2020.03-dev/apache/entrypoint.sh b/2020.03-dev/apache/entrypoint.sh
index 8a9577f8..0eb5c756 100755
--- a/2020.03-dev/apache/entrypoint.sh
+++ b/2020.03-dev/apache/entrypoint.sh
@@ -23,8 +23,8 @@ setup_ssmtp() {
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
-		sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
 
 		# add possible mail-senders
 		{
diff --git a/2020.03-dev/fpm-alpine/Dockerfile b/2020.03-dev/fpm-alpine/Dockerfile
index c6033f37..524cb07d 100644
--- a/2020.03-dev/fpm-alpine/Dockerfile
+++ b/2020.03-dev/fpm-alpine/Dockerfile
@@ -7,7 +7,8 @@ RUN set -ex; \
         rsync \
         git \
 # For mail() support
-        ssmtp;
+        ssmtp \
+        shadow;
 
 # install the PHP extensions we need
 # see https://friendi.ca/resources/requirements/
diff --git a/2020.03-dev/fpm-alpine/entrypoint-dev.sh b/2020.03-dev/fpm-alpine/entrypoint-dev.sh
index 72c1c21f..55afb809 100755
--- a/2020.03-dev/fpm-alpine/entrypoint-dev.sh
+++ b/2020.03-dev/fpm-alpine/entrypoint-dev.sh
@@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 	fi
 fi
 
-/entrypoint.sh "$@"
+exec /entrypoint.sh "$@"
diff --git a/2020.03-dev/fpm-alpine/entrypoint.sh b/2020.03-dev/fpm-alpine/entrypoint.sh
index 8a9577f8..0eb5c756 100755
--- a/2020.03-dev/fpm-alpine/entrypoint.sh
+++ b/2020.03-dev/fpm-alpine/entrypoint.sh
@@ -23,8 +23,8 @@ setup_ssmtp() {
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
-		sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
 
 		# add possible mail-senders
 		{
diff --git a/2020.03-dev/fpm/Dockerfile b/2020.03-dev/fpm/Dockerfile
index fc8650af..1f0dfb14 100644
--- a/2020.03-dev/fpm/Dockerfile
+++ b/2020.03-dev/fpm/Dockerfile
@@ -24,7 +24,6 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         mysql-client \
         bash \
-        $PHPIZE_DEPS \
         libpng-dev \
         libjpeg62-turbo-dev \
         libtool \
diff --git a/2020.03-dev/fpm/entrypoint-dev.sh b/2020.03-dev/fpm/entrypoint-dev.sh
index 72c1c21f..55afb809 100755
--- a/2020.03-dev/fpm/entrypoint-dev.sh
+++ b/2020.03-dev/fpm/entrypoint-dev.sh
@@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 	fi
 fi
 
-/entrypoint.sh "$@"
+exec /entrypoint.sh "$@"
diff --git a/2020.03-dev/fpm/entrypoint.sh b/2020.03-dev/fpm/entrypoint.sh
index 8a9577f8..0eb5c756 100755
--- a/2020.03-dev/fpm/entrypoint.sh
+++ b/2020.03-dev/fpm/entrypoint.sh
@@ -23,8 +23,8 @@ setup_ssmtp() {
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
-		sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
 
 		# add possible mail-senders
 		{
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 2e159bf7..4070d311 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -6,7 +6,8 @@ RUN set -ex; \
         rsync \
         git \
 # For mail() support
-        ssmtp;
+        ssmtp \
+        shadow;
 
 # install the PHP extensions we need
 # see https://friendi.ca/resources/requirements/
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index bbe72539..8d682e60 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -23,7 +23,6 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         mysql-client \
         bash \
-        $PHPIZE_DEPS \
         libpng-dev \
         libjpeg62-turbo-dev \
         libtool \
diff --git a/docker-entrypoint-dev.sh b/docker-entrypoint-dev.sh
index 72c1c21f..55afb809 100755
--- a/docker-entrypoint-dev.sh
+++ b/docker-entrypoint-dev.sh
@@ -66,4 +66,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 	fi
 fi
 
-/entrypoint.sh "$@"
+exec /entrypoint.sh "$@"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8a9577f8..0eb5c756 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -23,8 +23,8 @@ setup_ssmtp() {
 		smtp_from=${SMTP_FROM:-no-reply}
 
 		# Setup SSMTP
-		sed -i "s/:root:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
-		sed -i "s/:Linux\ User:/:${FRIENDICA_SITENAME}:/g" /etc/passwd
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" root
+		usermod --comment "$(echo "${FRIENDICA_SITENAME}" | tr -dc '[:alnum:]')" www-data
 
 		# add possible mail-senders
 		{