diff --git a/Startup.cs b/Startup.cs
index db04e2b..afe543d 100644
--- a/Startup.cs
+++ b/Startup.cs
@@ -52,15 +52,7 @@ namespace Test01
         // Test jenkins
         public void ConfigureServices(IServiceCollection services)
         {
-            var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST");
-            var DB_PORT = Environment.GetEnvironmentVariable("DB_PORT");
-            var DB_NAME = Environment.GetEnvironmentVariable("DB_NAME");
-            var DB_USERNAME = Environment.GetEnvironmentVariable("DB_USERNAME");
-            var DB_PASSWORD = Environment.GetEnvironmentVariable("DB_PASSWORD");
-
-            var envConnectionString = $"Server={DB_HOST};Port={DB_PORT};Database={DB_NAME};User ID={DB_USERNAME};Password={DB_PASSWORD};";
-
-            string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("mainDBConnectionString");
+            string connectionString = MyHelper.GetConfig(Configuration, "connectionStrings:mainDBConnectionString");
 
             string SiteInformation_appsite = MyHelper.GetConfig(Configuration, "SiteInformation:appsite");
             string SiteInformation_apisite = MyHelper.GetConfig(Configuration, "SiteInformation:apisite");
diff --git a/Utils/MyDatabase.cs b/Utils/MyDatabase.cs
index 09c7761..05454ce 100644
--- a/Utils/MyDatabase.cs
+++ b/Utils/MyDatabase.cs
@@ -23,15 +23,7 @@ namespace TTSW.Utils
         {
             System.Data.DataSet ds = new DataSet();
 
-            var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST");
-            var DB_PORT = Environment.GetEnvironmentVariable("DB_PORT");
-            var DB_NAME = Environment.GetEnvironmentVariable("DB_NAME");
-            var DB_USERNAME = Environment.GetEnvironmentVariable("DB_USERNAME");
-            var DB_PASSWORD = Environment.GetEnvironmentVariable("DB_PASSWORD");
-
-            var envConnectionString = $"Server={DB_HOST};Port={DB_PORT};Database={DB_NAME};User ID={DB_USERNAME};Password={DB_PASSWORD};";
-
-            string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("externalDBConnectionString");
+            string connectionString = MyHelper.GetConfig(Configuration, "connectionStrings:externalDBConnectionString"); ;
 
             using (NpgsqlConnection conn = new NpgsqlConnection(connectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(queryString, conn))