diff --git a/Core.Blueprint.Mongo/Configuration/RegisterBlueprint.cs b/Core.Blueprint.Mongo/Configuration/RegisterBlueprint.cs
index e690faa..ec55e3f 100644
--- a/Core.Blueprint.Mongo/Configuration/RegisterBlueprint.cs
+++ b/Core.Blueprint.Mongo/Configuration/RegisterBlueprint.cs
@@ -22,43 +22,37 @@ namespace Core.Blueprint.DAL.Mongo.Configuration
         /// <returns>The updated <see cref="IServiceCollection"/> with MongoDB services registered.</returns>
         public static IServiceCollection AddMongoLayer(this IServiceCollection services, IConfiguration configuration)
         {
-            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? string.Empty;
-
+            string text = "Local";
             services.AddSingleton<IMongoContext, MongoContext>();
-
-            var ConnectionString = configuration.GetSection("ConnectionStrings:MongoDB").Value ?? string.Empty;
-            var Databasename = configuration.GetSection("MongoDb:DatabaseName").Value ?? string.Empty;
-            var Audience = (environment == "Local")
+            string ConnectionString = configuration.GetSection("ConnectionStrings:MongoDB").Value ?? string.Empty;
+            string Databasename = configuration.GetSection("MongoDb:DatabaseName").Value ?? string.Empty;
+            string Audience = text == "Local"
                 ? configuration.GetSection("MongoDb:LocalAudience").Value
                 : configuration.GetSection("MongoDb:Audience").Value;
-
             if (string.IsNullOrEmpty(ConnectionString) || string.IsNullOrEmpty(Databasename) || string.IsNullOrEmpty(Audience))
+            {
                 throw new InvalidOperationException("Mongo connection is not configured correctly.");
+            }
 
-            services.Configure<MongoDbSettings>(options =>
+            services.Configure(delegate (MongoDbSettings options)
             {
                 options.ConnectionString = ConnectionString;
                 options.Databasename = Databasename;
                 options.Audience = Audience;
             });
-
-            services.AddSingleton<IMongoClient>(serviceProvider =>
+            services.AddSingleton((Func<IServiceProvider, IMongoClient>)delegate (IServiceProvider serviceProvider)
             {
-                var settings = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value;
-                var mongoClientSettings = MongoClientSettings.FromConnectionString(settings.ConnectionString);
-                mongoClientSettings.Credential = MongoCredential.CreateOidcCredential(new AzureIdentityProvider(settings.Audience));
+                MongoDbSettings value2 = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value;
+                MongoClientSettings mongoClientSettings = MongoClientSettings.FromConnectionString(value2.ConnectionString);
+                //mongoClientSettings.Credential = MongoCredential.CreateOidcCredential(new AzureIdentityProvider(value2.Audience));
                 return new MongoClient(mongoClientSettings);
             });
-
-            services.AddSingleton<IMongoDatabase>(serviceProvider =>
+            services.AddSingleton(delegate (IServiceProvider serviceProvider)
             {
-                var settings = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value;
-                var client = serviceProvider.GetRequiredService<IMongoClient>();
-                return client.GetDatabase(settings.Databasename);
+                MongoDbSettings value = serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value;
+                return serviceProvider.GetRequiredService<IMongoClient>().GetDatabase(value.Databasename);
             });
-
-            services.AddSingleton<IMongoDbSettings>(serviceProvider => serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value);
-
+            services.AddSingleton((Func<IServiceProvider, IMongoDbSettings>)((IServiceProvider serviceProvider) => serviceProvider.GetRequiredService<IOptions<MongoDbSettings>>().Value));
             return services;
         }
     }