diff --git a/.vscode/launch.json b/.vscode/launch.json
index fcc80a75..b77f3b95 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs
index 2b6f55c1..8c6e2800 100644
--- a/server/AyaNova/Controllers/ServerStateController.cs
+++ b/server/AyaNova/Controllers/ServerStateController.cs
@@ -182,14 +182,15 @@ namespace AyaNova.Api.Controllers
                 {
                     AYANOVA_DEFAULT_TRANSLATION = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION,
                     AYANOVA_USE_URLS = ServerBootConfig.AYANOVA_USE_URLS,
-                    AYANOVA_DB_CONNECTION = ServerBootConfig.AYANOVA_DB_CONNECTION,
+                    AYANOVA_DB_CONNECTION = DbUtil.PasswordRedactedConnectionString(ServerBootConfig.AYANOVA_DB_CONNECTION),
                     AYANOVA_FOLDER_USER_FILES = ServerBootConfig.AYANOVA_FOLDER_USER_FILES,
                     AYANOVA_FOLDER_BACKUP_FILES = ServerBootConfig.AYANOVA_FOLDER_BACKUP_FILES,
                     AYANOVA_FOLDER_TEMPORARY_SERVER_FILES = ServerBootConfig.AYANOVA_FOLDER_TEMPORARY_SERVER_FILES,
                     AYANOVA_BACKUP_PG_DUMP_PATH = ServerBootConfig.AYANOVA_BACKUP_PG_DUMP_PATH,
                     AYANOVA_LOG_PATH = ServerBootConfig.AYANOVA_LOG_PATH,
                     AYANOVA_LOG_LEVEL = ServerBootConfig.AYANOVA_LOG_LEVEL,
-                    AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG = ServerBootConfig.AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG
+                    AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG = ServerBootConfig.AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG,
+                    BOOT_DIAGNOSTIC_INFO = ServerBootConfig.BOOT_DIAGNOSTIC_INFO
                 }));
         }
 
diff --git a/server/AyaNova/Program.cs b/server/AyaNova/Program.cs
index 76a5c8a6..edca3134 100644
--- a/server/AyaNova/Program.cs
+++ b/server/AyaNova/Program.cs
@@ -180,11 +180,26 @@ namespace AyaNova
 
 
             //Log environmental settings
+
             logger.Info("OS - {0}", Environment.OSVersion.ToString());
+            logger.Info("TimeZone - {0}", TimeZoneInfo.Local.DisplayName);
             logger.Debug("Machine - {0}", Environment.MachineName);
             logger.Debug("User - {0}", Environment.UserName);
             logger.Debug(".Net Version - {0}", Environment.Version.ToString());
-            logger.Debug("CPU count - {0}", Environment.ProcessorCount);
+            logger.Debug("CPU count - {0}", Environment.ProcessorCount);            
+            logger.Debug("RAM - {0}", FileUtil.GetBytesReadable(GC.GetGCMemoryInfo().TotalAvailableMemoryBytes));
+
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("OS", Environment.OSVersion.ToString());
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Machine", Environment.MachineName);
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("User", Environment.UserName);
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add(".Net Version", Environment.Version.ToString());
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("CPU count", Environment.ProcessorCount.ToString());
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("AyaNova server boot local time", DateTime.Now.ToString("s"));
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Server up time", TimeSpan.FromTicks(Environment.TickCount64).ToString());
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("TimeZone", TimeZoneInfo.Local.DisplayName);
+            ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("RAM", FileUtil.GetBytesReadable(GC.GetGCMemoryInfo().TotalAvailableMemoryBytes));
+            // ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("XXX",XXXX);
+            // ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("XXX",XXXX);
 
 
             #endregion
diff --git a/server/AyaNova/util/ServerBootConfig.cs b/server/AyaNova/util/ServerBootConfig.cs
index 6c733c3d..62f7f0d8 100644
--- a/server/AyaNova/util/ServerBootConfig.cs
+++ b/server/AyaNova/util/ServerBootConfig.cs
@@ -82,6 +82,9 @@ namespace AyaNova.Util
         //SECURITY
         internal static string AYANOVA_SET_SUPERUSER_PW { get; set; }
 
+        //HELPFUL INFORMATION FOR DIAGNOSTICS
+        internal static Dictionary<string,string> BOOT_DIAGNOSTIC_INFO {get;set;}
+
 
         /// <summary>
         /// Populate the config from the configuration found at boot
@@ -90,6 +93,7 @@ namespace AyaNova.Util
         /// <param name="config"></param>
         internal static void SetConfiguration(IConfigurationRoot config)
         {
+            BOOT_DIAGNOSTIC_INFO=new Dictionary<string, string>();
 
 #if (DEBUG)
             TranslationKeysRequested = new List<string>();