diff --git a/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/17.0/apache/entrypoint.sh
+++ b/17.0/apache/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/17.0/fpm-alpine/entrypoint.sh
+++ b/17.0/fpm-alpine/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/17.0/fpm/entrypoint.sh
+++ b/17.0/fpm/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/18.0/apache/entrypoint.sh b/18.0/apache/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/18.0/apache/entrypoint.sh
+++ b/18.0/apache/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/18.0/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/18.0/fpm-alpine/entrypoint.sh
+++ b/18.0/fpm-alpine/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/18.0/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/18.0/fpm/entrypoint.sh
+++ b/18.0/fpm/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/19.0/apache/entrypoint.sh b/19.0/apache/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/19.0/apache/entrypoint.sh
+++ b/19.0/apache/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/19.0/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/19.0/fpm-alpine/entrypoint.sh
+++ b/19.0/fpm-alpine/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/19.0/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/19.0/fpm/entrypoint.sh
+++ b/19.0/fpm/entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"
diff --git a/README.md b/README.md
index 58041b1d..c418622a 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ One or more trusted domains can be set through environment variable, too. They w
 
 - `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
 
-The install and update script is only triggered when a default command is used (`apache2-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
 
 - `NEXTCLOUD_UPDATE` (default: _0_)
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index f1dd332c..b9ec5fc5 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -43,13 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
-if expr "$1" : "apache2-foreground" 1>/dev/null; then
+if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
     fi
 fi
 
-if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
+if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
     if [ -n "${REDIS_HOST+x}" ]; then
 
         echo "Configuring Redis as session handler"