diff --git a/src/PinguApps.Appwrite.Client/ServiceCollectionExtensions.cs b/src/PinguApps.Appwrite.Client/ServiceCollectionExtensions.cs
index de586dfb..d3b7bb89 100644
--- a/src/PinguApps.Appwrite.Client/ServiceCollectionExtensions.cs
+++ b/src/PinguApps.Appwrite.Client/ServiceCollectionExtensions.cs
@@ -129,24 +129,24 @@ public static IServiceCollection AddAppwriteClientForServer(this IServiceCollect
             .AddHttpMessageHandler(() => new PolicyHttpMessageHandler(GetCircuitBreakerPolicy<IDatabasesApi>(services, policyOptions)))
             .ConfigurePrimaryHttpMessageHandler(ConfigurePrimaryHttpMessageHandler);
 
-        services.AddSingleton<IClientAccountClient>(sp =>
+        services.AddScoped<IClientAccountClient>(sp =>
         {
             var api = sp.GetRequiredService<IAccountApi>();
             var config = sp.GetRequiredKeyedService<Config>("Client");
             return new ClientAccountClient(api, config);
         });
-        services.AddSingleton<IClientTeamsClient>(sp =>
+        services.AddScoped<IClientTeamsClient>(sp =>
         {
             var api = sp.GetRequiredService<ITeamsApi>();
             var config = sp.GetRequiredKeyedService<Config>("Client");
             return new ClientTeamsClient(api, config);
         });
-        services.AddSingleton<IClientDatabasesClient>(sp =>
+        services.AddScoped<IClientDatabasesClient>(sp =>
         {
             var api = sp.GetRequiredService<IDatabasesApi>();
             return new ClientDatabasesClient(api);
         });
-        services.AddSingleton<IClientAppwriteClient, ClientAppwriteClient>();
+        services.AddScoped<IClientAppwriteClient, ClientAppwriteClient>();
 
         return services;
     }
diff --git a/src/PinguApps.Appwrite.Shared/Constants.cs b/src/PinguApps.Appwrite.Shared/Constants.cs
index 8bb9937c..0587666f 100644
--- a/src/PinguApps.Appwrite.Shared/Constants.cs
+++ b/src/PinguApps.Appwrite.Shared/Constants.cs
@@ -1,5 +1,5 @@
 namespace PinguApps.Appwrite.Shared;
 public static class Constants
 {
-    public const string Version = "2.0.3";
+    public const string Version = "2.0.4";
 }