diff --git a/opensim/defaults/StandaloneCommon.ini b/opensim/defaults/StandaloneCommon.ini
index 380ddfa..8210467 100644
--- a/opensim/defaults/StandaloneCommon.ini
+++ b/opensim/defaults/StandaloneCommon.ini
@@ -1,8 +1,5 @@
 ; This is the main configuration file for an instance of OpenSim running in standalone mode
 
-[DatabaseService]
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
-
 [Hypergrid]
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
diff --git a/opensim/docker-entrypoint.sh b/opensim/docker-entrypoint.sh
index 3aac662..020925f 100755
--- a/opensim/docker-entrypoint.sh
+++ b/opensim/docker-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -Eeuo pipefail
+set -Eeo pipefail
 
 chown -R $(id -u):$(id -g) defaults
 
@@ -11,6 +11,15 @@ fi
 if [ ! -e config-include/StandaloneCommon.ini ]; then
 	echo >&2 "INFO: No Grid Common configuration found, pulling one together."
 	cp defaults/StandaloneCommon.ini config-include/StandaloneCommon.ini
+
+	echo "[DatabaseService]" >> config-include/StandaloneCommon.ini
+	if [[ "${DATABASE_ENGINE}" == "mysql" ]]; then
+		echo "    StorageProvider = \"OpenSim.Data.MySQL.dll\"" >> config-include/StandaloneCommon.ini
+		echo "    ConnectionString = \"Data Source=${MYSQL_SERVER:-db};Database=${MYSQL_DATABASE:-opensim};User ID=${MYSQL_USER:-root};Password=${MYSQL_PASSWORD};Old Guids=true;\"" >> config-include/StandaloneCommon.ini
+	else
+		echo "    Include-Storage = \"config-include/storage/SQLiteStandalone.ini\"" >> config-include/StandaloneCommon.ini
+	fi
+	cat config-include/StandaloneCommon.ini
 fi
 
 if [ `find Regions -maxdepth 1 -name '*.ini' | wc -l` -eq 0 ]; then