diff --git a/immich/rootfs/etc/cont-init.d/99-run.sh b/immich/rootfs/etc/cont-init.d/99-run.sh
index d75d30a0c488..7d15352a4136 100755
--- a/immich/rootfs/etc/cont-init.d/99-run.sh
+++ b/immich/rootfs/etc/cont-init.d/99-run.sh
@@ -29,6 +29,20 @@ for KEYS in "${arr[@]}"; do
     export "${KEYS}=${VALUE//[\"\']/}"
 done
 
+######################
+# Switch of database #
+######################
+
+if [ -f /share/postgresql_immich.tar.gz ]; then
+    bashio::log.warning "Your previous database was exported to /share/postgresql_immich.tar.gz"
+elif [ -d /data/postgresql ]; then
+    bashio::log.warning "------------------------------------"
+    bashio::log.warning "Internal postgres database detected, copying to /share/postgresql_immich.tar.gz"
+    bashio::log.warning "------------------------------------"
+    tar -zcvf /share/postgresql_immich.tar.gz /data/postgresql
+    rm -r /data/postgresql
+fi
+
 ###################
 # Define database #
 ###################
@@ -36,71 +50,55 @@ done
 bashio::log.info "Defining database"
 bashio::log.info "-----------------"
 
-case $(bashio::config 'database') in
-
-    "external_postgresql")
-
-        bashio::log.info "Using external postgresql"
-        bashio::log.info ""
-
-        # Check if values exist
-        if ! bashio::config.has_value 'DB_USERNAME' && \
-            ! bashio::config.has_value 'DB_HOSTNAME' && \
-            ! bashio::config.has_value 'DB_PASSWORD' && \
-            ! bashio::config.has_value 'DB_DATABASE_NAME' && \
-            ! bashio::config.has_value 'JWT_SECRET' && \
-            ! bashio::config.has_value 'DB_PORT'
-        then
-            ! bashio::exit.nok "Please make sure that the following options are set : DB_USERNAME, DB_HOSTNAME, DB_PASSWORD, DB_DATABASE_NAME, DB_PORT"
-        fi
-
-        # Settings parameters
-        export DB_USERNAME=$(bashio::config 'DB_USERNAME')
-        export DB_HOSTNAME=$(bashio::config 'DB_HOSTNAME')
-        export DB_PASSWORD=$(bashio::config 'DB_PASSWORD')
-        export DB_DATABASE_NAME=$(bashio::config 'DB_DATABASE_NAME')
-        export DB_PORT=$(bashio::config 'DB_PORT')
-        export JWT_SECRET=$(bashio::config 'JWT_SECRET')
-        ;;
-
-    **)
-
-        bashio::log.info "Using internal postgresql"
-        bashio::log.info ""
-
-        # Settings files & permissions
-        ln -s /usr/lib/postgresql/14/bin/postgres /usr/bin || true
-        ln -s /usr/lib/postgresql/14/bin/psql /usr/psql || true
-        mkdir -p /data/postgresql
-        cp -rnf /var/lib/postgresql/14/main/* /data/postgresql/
-        chown -R postgres /data/postgresql
-        chmod -R 700 /data/postgresql
-
-        # Start postgresql
-        /etc/init.d/postgresql start
-
-        # Create database
-        echo "CREATE ROLE root WITH LOGIN SUPERUSER CREATEDB CREATEROLE PASSWORD 'securepassword';
-             CREATE DATABASE immich; CREATE USER immich WITH ENCRYPTED PASSWORD 'immich';
-             GRANT ALL PRIVILEGES ON DATABASE immich to immich;
-        \q"> setup_postgres.sql
-        chown postgres setup_postgres.sql
-        # shellcheck disable=SC2024
-        sudo -iu postgres psql < setup_postgres.sql
-        rm setup_postgres.sql
-
-        # Settings parameters
-        export DB_USERNAME=immich
-        export DB_HOSTNAME=localhost
-        export DB_PASSWORD=immich
-        export DB_DATABASE_NAME=immich
-        export DB_PORT=5432
-        export JWT_SECRET=$(bashio::config 'JWT_SECRET')
-        ;;
-
-esac
-
-##################
-# Starting redis #
-##################
-exec redis-server & bashio::log.info "Starting redis"
+bashio::log.info "Connecting to external postgresql"
+bashio::log.info ""
+
+# Check if values exist
+if ! bashio::config.has_value 'DB_USERNAME' && \
+    ! bashio::config.has_value 'DB_HOSTNAME' && \
+    ! bashio::config.has_value 'DB_PASSWORD' && \
+    ! bashio::config.has_value 'DB_DATABASE_NAME' && \
+    ! bashio::config.has_value 'JWT_SECRET' && \
+    ! bashio::config.has_value 'DB_PORT'; then
+    ! bashio::exit.nok "Please make sure that the following options are set : DB_USERNAME, DB_HOSTNAME, DB_PASSWORD, DB_DATABASE_NAME, DB_PORT"
+fi
+
+# Settings parameters
+export DB_USERNAME=$(bashio::config 'DB_USERNAME')
+export DB_HOSTNAME=$(bashio::config 'DB_HOSTNAME')
+export DB_PASSWORD=$(bashio::config 'DB_PASSWORD')
+export DB_DATABASE_NAME=$(bashio::config 'DB_DATABASE_NAME')
+export DB_PORT=$(bashio::config 'DB_PORT')
+export JWT_SECRET=$(bashio::config 'JWT_SECRET')
+
+# Export variables
+if [ -d /var/run/s6/container_environment ]; then
+    printf "%s" "$DB_USERNAME" > /var/run/s6/container_environment/DB_USERNAME
+    printf "%s" "$DB_PASSWORD" > /var/run/s6/container_environment/DB_PASSWORD
+    printf "%s" "$DB_DATABASE_NAME" > /var/run/s6/container_environment/DB_DATABASE_NAME
+    printf "%s" "$DB_PORT" > /var/run/s6/container_environment/DB_PORT
+    printf "%s" "$DB_HOSTNAME" > /var/run/s6/container_environment/DB_HOSTNAME
+    printf "%s" "$JWT_SECRET" > /var/run/s6/container_environment/JWT_SECRET
+fi
+
+{
+    printf "%s" "DB_USERNAME=\"$DB_USERNAME\""
+    printf "%s" "DB_PASSWORD=\"$DB_PASSWORD\""
+    printf "%s" "DB_DATABASE_NAME=\"$DB_DATABASE_NAME\""
+    printf "%s" "DB_PORT=\"$DB_PORT\""
+    printf "%s" "DB_HOSTNAME=\"$DB_HOSTNAME\""
+    printf "%s" "JWT_SECRET=\"$JWT_SECRET\""
+} >> ~/.bashrc
+
+###################
+# Create database #
+###################
+
+# Create database if does not exist
+echo "CREATE ROLE root WITH LOGIN SUPERUSER CREATEDB CREATEROLE PASSWORD 'securepassword';
+     CREATE DATABASE immich; CREATE USER immich WITH ENCRYPTED PASSWORD 'immich'; GRANT ALL PRIVILEGES ON DATABASE immich to immich;
+\q"> setup_postgres.sql
+psql "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOSTNAME:$DB_PORT" < setup_postgres.sql || true
+
+# Clean
+rm setup_postgres.sql