diff --git a/ente/Dockerfile b/ente/Dockerfile
index 509ca2c6a..e33f78af7 100644
--- a/ente/Dockerfile
+++ b/ente/Dockerfile
@@ -116,4 +116,4 @@ LABEL \
 # 6 Finish line #
 #################
 # S6 will pick up run scripts from /etc/services.d supplied in rootfs
-# and launch:  › minio  › museum API  › (optional) web‑UI
+# and launch:  › minio  › museum API  › (optional) web‑UI
\ No newline at end of file
diff --git a/ente/config.json b/ente/config.json
index d2a261aa0..f7ad2a9bc 100644
--- a/ente/config.json
+++ b/ente/config.json
@@ -77,7 +77,7 @@
   "startup": "services",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.0.0test3",
+  "version": "1.0.0test4",
   "video": true,
   "webui": "http://[HOST]:[PORT:3000]"
 }
diff --git a/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh b/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh
index 031282e72..3e0704366 100755
--- a/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh
+++ b/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh
@@ -16,7 +16,6 @@ DB_NAME="$(bashio::config 'DB_DATABASE_NAME')"
 until pg_isready -q -h localhost -p 5432 -U postgres; do
 	bashio::log.info "Waiting for Postgres to accept connections…"
 	sleep 1
-done
 
 bashio::log.info "Creating role + database if needed…"
 su - postgres -c psql <<SQL
@@ -33,3 +32,5 @@ END
 SQL
 
 bashio::log.info "Internal Postgres ready."
+
+done
diff --git a/ente/rootfs/etc/cont-init.d/99-run.sh b/ente/rootfs/etc/cont-init.d/99-run.sh
index 74aacd4ed..ad6c5a1dc 100755
--- a/ente/rootfs/etc/cont-init.d/99-run.sh
+++ b/ente/rootfs/etc/cont-init.d/99-run.sh
@@ -11,14 +11,55 @@ mkdir -p /config/scripts/compose
 
 bashio::log.info "Starting services"
 
-# Loop through each directory in /etc/services.d/
+################
+# Run services #
+################
+
 for dir in /etc/services.d/*; do
 	# Check if the directory contains a 'run' file
 	if [ -f "$dir/run" ]; then
 		# Execute the 'run' file
-		echo "Starting service in $dir"
+		bashio::log.info "Starting service $dir"
 		bash "$dir/run"
 	else
-		echo "No run file found in $dir"
+		bashio::log.fatal "No run file found in $dir"
 	fi
 done
+
+#########################
+# Internal db bootstrap #
+#########################
+
+if bashio::config.true 'USE_EXTERNAL_DB'; then
+	bashio::log.info "External DB in use; skipping internal Postgres bootstrap."
+	exit 0
+fi
+
+bashio::log.info "Bootstrapping internal Postgres cluster…"
+
+DB_USER="$(bashio::config 'DB_USERNAME')"
+DB_PASS="$(bashio::config 'DB_PASSWORD')"
+DB_NAME="$(bashio::config 'DB_DATABASE_NAME')"
+
+# Wait for postgres service (localhost)
+until pg_isready -q -h localhost -p 5432 -U postgres; do
+	bashio::log.info "Waiting for Postgres to accept connections…"
+	sleep 1
+
+bashio::log.info "Creating role + database if needed…"
+su - postgres -c psql <<SQL
+DO \$\$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '${DB_USER}') THEN
+      CREATE ROLE ${DB_USER} LOGIN PASSWORD '${DB_PASS}';
+   END IF;
+   IF NOT EXISTS (SELECT FROM pg_database WHERE datname = '${DB_NAME}') THEN
+      CREATE DATABASE ${DB_NAME} OWNER ${DB_USER};
+   END IF;
+END
+\$\$;
+SQL
+
+bashio::log.info "Internal Postgres ready."
+
+done