diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3efe2c..79f012b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,6 +44,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SQLSERVER_DB_SERVER: ${{ secrets.SQLSERVER_DB_SERVER }}
+          MONGO_DB_SERVER: ${{ secrets.MONGO_DB_SERVER }}
         shell: powershell
         run: |
           .\.sonar\scanner\dotnet-sonarscanner begin /k:"csimonapastore_BasicDotnetTemplate" /o:"csimonapastore-github" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
diff --git a/MainProject/Models/Settings/DatabaseSettings.cs b/MainProject/Models/Settings/DatabaseSettings.cs
index af9fd51..517d105 100644
--- a/MainProject/Models/Settings/DatabaseSettings.cs
+++ b/MainProject/Models/Settings/DatabaseSettings.cs
@@ -4,6 +4,6 @@ public class DatabaseSettings
 {
 #nullable enable
     public string? SqlServerConnectionString { get; set; }
-    public MongoDbSettings? MongoDbSettings { get; set; }
+    public string? MongoDbConnectionString { get; set; }
 #nullable disable
 }
\ No newline at end of file
diff --git a/MainProject/Models/Settings/MongoDbSettings.cs b/MainProject/Models/Settings/MongoDbSettings.cs
deleted file mode 100644
index 042ddc6..0000000
--- a/MainProject/Models/Settings/MongoDbSettings.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace BasicDotnetTemplate.MainProject.Models.Settings;
-
-public class MongoDbSettings
-{
-#nullable enable
-    public string? MongoDbConnectionString { get; set; }
-    public string? DatabaseName { get; set; }
-#nullable disable
-}
\ No newline at end of file
diff --git a/MainProject/Utils/ProgramUtils.cs b/MainProject/Utils/ProgramUtils.cs
index b5424f5..3f67904 100644
--- a/MainProject/Utils/ProgramUtils.cs
+++ b/MainProject/Utils/ProgramUtils.cs
@@ -137,9 +137,6 @@ public static class ProgramUtils
         if (!String.IsNullOrEmpty(connectionString))
         {
             connectionString = connectionString.Replace("SQLSERVER_DB_SERVER", Environment.GetEnvironmentVariable("SQLSERVER_DB_SERVER"));
-            connectionString = connectionString.Replace("SQLSERVER_DB_DATABASE", Environment.GetEnvironmentVariable("SQLSERVER_DB_DATABASE"));
-            connectionString = connectionString.Replace("SQLSERVER_DB_USER", Environment.GetEnvironmentVariable("SQLSERVER_DB_USER"));
-            connectionString = connectionString.Replace("SQLSERVER_DB_PASSWORD", Environment.GetEnvironmentVariable("SQLSERVER_DB_PASSWORD"));
 
             builder.Services.AddDbContext<SqlServerContext>(options =>
                 options.UseSqlServer(connectionString));
@@ -147,20 +144,15 @@ public static class ProgramUtils
             databaseAdded += "SqlServer";
         }
 
-
-
-        connectionString = appSettings?.DatabaseSettings?.MongoDbSettings?.MongoDbConnectionString ?? String.Empty;
+        connectionString = appSettings?.DatabaseSettings?.MongoDbConnectionString ?? String.Empty;
 
         if (!String.IsNullOrEmpty(connectionString))
         {
-            connectionString = connectionString.Replace("MONGODB_DB_SERVER", Environment.GetEnvironmentVariable("MONGODB_DB_SERVER"));
-            connectionString = connectionString.Replace("MONGODB_DB_DATABASE", Environment.GetEnvironmentVariable("MONGODB_DB_DATABASE"));
-            connectionString = connectionString.Replace("MONGODB_DB_USER", Environment.GetEnvironmentVariable("MONGODB_DB_USER"));
-            connectionString = connectionString.Replace("MONGODB_DB_PASSWORD", Environment.GetEnvironmentVariable("MONGODB_DB_PASSWORD"));
+            connectionString = connectionString.Replace("MONGO_DB_SERVER", Environment.GetEnvironmentVariable("MONGODB_DB_SERVER"));
 
             var mongoClient = new MongoClient(connectionString);
 
-            var databaseName = appSettings?.DatabaseSettings?.MongoDbSettings?.DatabaseName ?? Environment.GetEnvironmentVariable("MONGODB_DB_DATABASE") ?? String.Empty;
+            var databaseName = connectionString.Split("/").LastOrDefault();
 
             if (!String.IsNullOrEmpty(databaseName))
             {
diff --git a/MainProject/appsettings.json b/MainProject/appsettings.json
index 46a5864..a61bba2 100644
--- a/MainProject/appsettings.json
+++ b/MainProject/appsettings.json
@@ -7,11 +7,8 @@
             "Description": "This template contains basic configuration for a .Net 8 backend"            
         },
         "DatabaseSettings": {
-            "SqlServerConnectionString": "Server=SQLSERVER_DB_SERVER;Initial Catalog=SQLSERVER_DB_DATABASE;User Id=SQLSERVER_DB_USER;Password=SQLSERVER_DB_PASSWORD;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
-            "MongoDbSettings": {
-                "MongoDbConnectionString": "mongodb://MONGODB_DB_USER:MONGODB_DB_PASSWORD@MONGODB_DB_SERVER:27017/MONGODB_DB_DATABASE",
-                "DatabaseName": "BaseDb"
-            }
+            "SqlServerConnectionString": "SQLSERVER_DB_SERVER",
+            "MongoDbConnectionString": "MONGO_DB_SERVER"
         },
         "OpenApiSettings": {
             "TermsOfServiceUrl": "",