diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/12.0/apache/entrypoint.sh
+++ b/12.0/apache/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/12.0/fpm-alpine/entrypoint.sh
+++ b/12.0/fpm-alpine/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/12.0/fpm/entrypoint.sh
+++ b/12.0/fpm/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index 8e74897..aa40a11 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8e74897..aa40a11 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -13,7 +13,7 @@ directory_empty() {
 
 run_as() {
     if [ "$(id -u)" = 0 ]; then
-        su - www-data -s /bin/sh -c "$1"
+        su -p www-data -s /bin/sh -c "$1"
     else
         sh -c "$1"
     fi
@@ -55,30 +55,30 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
             echo "New nextcloud instance"
             
             if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
-                install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
+                install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
                 if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
-                    install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
+                    install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
                 else
-                    install_options="$install_options --database-table-prefix \"\""
+                    install_options=$install_options' --database-table-prefix ""'
                 fi
                 if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
-                    install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
+                    install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
                 fi
                 
                 if [  -n "${SQLITE_DATABASE+x}" ]; then
                     echo "Installing with SQLite database"
-                    install_options="$install_options --database-name \"$SQLITE_DATABASE\""
+                    install_options=$install_options' --database-name "$SQLITE_DATABASE"'
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
                     echo "Installing with MySQL database"
-                    install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
+                    install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
                     echo "waiting 30s for the database to setup"
                     sleep 30s
                     echo "starting nexcloud installation"
                     run_as "php /var/www/html/occ maintenance:install $install_options"
                 elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
                     echo "Installing with PostgreSQL database"
-                    install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
+                    install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
                     echo "waiting 10s for the database to setup"
                     sleep 10s
                     echo "starting nexcloud installation"