diff --git a/.gitignore b/.gitignore
index 69356f8..ff61026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ database-import/*.sql
 database-import/*.sql.gz
 database-import/*/
 database-import/ImportBackup*/
+db_*/
 source/*
 local-data-tools/
 changelogs/
diff --git a/setup.sh b/setup.sh
index 41c53b9..441cc01 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1661,6 +1661,15 @@ COMPOSE_PROJECT_NAME=$DEFAULT_COMPOSE_PROJECT_NAME
 
 STORAGE_PATH=$STORAGE_PATH
 STORAGE_PATH_LOCAL=$LOCAL_STORAGE_ROOT
+STORAGE_CONFIG_PATH=$(get_template_value "STORAGE_CONFIG_PATH")
+STORAGE_LOGS_PATH=$(get_template_value "STORAGE_LOGS_PATH")
+STORAGE_MODULES_PATH=$(get_template_value "STORAGE_MODULES_PATH")
+STORAGE_LUA_SCRIPTS_PATH=$(get_template_value "STORAGE_LUA_SCRIPTS_PATH")
+STORAGE_MODULES_META_PATH=$(get_template_value "STORAGE_MODULES_META_PATH")
+STORAGE_MODULE_SQL_PATH=$(get_template_value "STORAGE_MODULE_SQL_PATH")
+STORAGE_INSTALL_MARKERS_PATH=$(get_template_value "STORAGE_INSTALL_MARKERS_PATH")
+STORAGE_CLIENT_DATA_PATH=$(get_template_value "STORAGE_CLIENT_DATA_PATH")
+STORAGE_LOCAL_SOURCE_PATH=$(get_template_value "STORAGE_LOCAL_SOURCE_PATH")
 BACKUP_PATH=$BACKUP_PATH
 TZ=$DEFAULT_TZ
 
@@ -1729,10 +1738,27 @@ CONTAINER_USER=$CONTAINER_USER
 CONTAINER_MYSQL=$DEFAULT_CONTAINER_MYSQL
 CONTAINER_DB_IMPORT=$DEFAULT_CONTAINER_DB_IMPORT
 CONTAINER_DB_INIT=$DEFAULT_CONTAINER_DB_INIT
+CONTAINER_DB_GUARD=$(get_template_value "CONTAINER_DB_GUARD")
 CONTAINER_BACKUP=$DEFAULT_CONTAINER_BACKUP
 CONTAINER_MODULES=$DEFAULT_CONTAINER_MODULES
 CONTAINER_POST_INSTALL=$DEFAULT_CONTAINER_POST_INSTALL
 
+# Database Guard Defaults
+DB_GUARD_RECHECK_SECONDS=$(get_template_value "DB_GUARD_RECHECK_SECONDS")
+DB_GUARD_RETRY_SECONDS=$(get_template_value "DB_GUARD_RETRY_SECONDS")
+DB_GUARD_WAIT_ATTEMPTS=$(get_template_value "DB_GUARD_WAIT_ATTEMPTS")
+DB_GUARD_HEALTH_MAX_AGE=$(get_template_value "DB_GUARD_HEALTH_MAX_AGE")
+DB_GUARD_HEALTHCHECK_INTERVAL=$(get_template_value "DB_GUARD_HEALTHCHECK_INTERVAL")
+DB_GUARD_HEALTHCHECK_TIMEOUT=$(get_template_value "DB_GUARD_HEALTHCHECK_TIMEOUT")
+DB_GUARD_HEALTHCHECK_RETRIES=$(get_template_value "DB_GUARD_HEALTHCHECK_RETRIES")
+DB_GUARD_VERIFY_INTERVAL_SECONDS=$(get_template_value "DB_GUARD_VERIFY_INTERVAL_SECONDS")
+
+# Module SQL staging
+STAGE_PATH_MODULE_SQL=$(get_template_value "STAGE_PATH_MODULE_SQL")
+
+# SQL Source Overlay
+AC_SQL_SOURCE_PATH=$(get_template_value "AC_SQL_SOURCE_PATH")
+
 # Ports
 AUTH_EXTERNAL_PORT=$AUTH_EXTERNAL_PORT
 AUTH_PORT=$DEFAULT_AUTH_INTERNAL_PORT
@@ -1749,6 +1775,8 @@ REALM_PORT=$REALM_PORT
 BACKUP_RETENTION_DAYS=$BACKUP_RETENTION_DAYS
 BACKUP_RETENTION_HOURS=$BACKUP_RETENTION_HOURS
 BACKUP_DAILY_TIME=$BACKUP_DAILY_TIME
+BACKUP_INTERVAL_MINUTES=$(get_template_value "BACKUP_INTERVAL_MINUTES")
+BACKUP_EXTRA_DATABASES=$(get_template_value "BACKUP_EXTRA_DATABASES")
 BACKUP_HEALTHCHECK_MAX_MINUTES=$BACKUP_HEALTHCHECK_MAX_MINUTES
 BACKUP_HEALTHCHECK_GRACE_SECONDS=$BACKUP_HEALTHCHECK_GRACE_SECONDS