diff --git a/src/OpenFeature.Contrib.Providers.Flagd/FlagdConfig.cs b/src/OpenFeature.Contrib.Providers.Flagd/FlagdConfig.cs
index b6360448..7a048464 100644
--- a/src/OpenFeature.Contrib.Providers.Flagd/FlagdConfig.cs
+++ b/src/OpenFeature.Contrib.Providers.Flagd/FlagdConfig.cs
@@ -68,7 +68,7 @@ internal FlagdConfig()
             _socketPath = Environment.GetEnvironmentVariable(EnvVarSocketPath) ?? "";
             var cacheStr = Environment.GetEnvironmentVariable(EnvVarCache) ?? "";
 
-            if (cacheStr.ToUpper().Equals("LRU"))
+            if (string.Equals(cacheStr, "LRU", StringComparison.OrdinalIgnoreCase))
             {
                 _cache = true;
                 _maxCacheSize = int.Parse(Environment.GetEnvironmentVariable(EnvVarMaxCacheSize) ?? $"{CacheSizeDefault}");
@@ -85,12 +85,12 @@ internal FlagdConfig(Uri url)
 
             _host = url.Host;
             _port = url.Port.ToString();
-            _useTLS = url.Scheme.ToLower().Equals("https");
+            _useTLS = string.Equals(url.Scheme, "https", StringComparison.OrdinalIgnoreCase);
             _cert = Environment.GetEnvironmentVariable(EnvCertPart) ?? "";
-            _socketPath = url.Scheme.ToLower().Equals("unix") ? url.GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Scheme, UriFormat.UriEscaped) : "";
+            _socketPath = string.Equals(url.Scheme, "unix", StringComparison.OrdinalIgnoreCase) ? url.GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Scheme, UriFormat.UriEscaped) : "";
             var cacheStr = Environment.GetEnvironmentVariable(EnvVarCache) ?? "";
 
-            if (cacheStr.ToUpper().Equals("LRU"))
+            if (string.Equals(cacheStr, "LRU", StringComparison.OrdinalIgnoreCase))
             {
                 _cache = true;
                 _maxCacheSize = int.Parse(Environment.GetEnvironmentVariable(EnvVarMaxCacheSize) ?? $"{CacheSizeDefault}");
diff --git a/src/OpenFeature.Contrib.Providers.Flagd/FlagdProvider.cs b/src/OpenFeature.Contrib.Providers.Flagd/FlagdProvider.cs
index 33d6c28c..69f49f04 100644
--- a/src/OpenFeature.Contrib.Providers.Flagd/FlagdProvider.cs
+++ b/src/OpenFeature.Contrib.Providers.Flagd/FlagdProvider.cs
@@ -27,10 +27,11 @@ namespace OpenFeature.Contrib.Providers.Flagd
     /// </summary>
     public sealed class FlagdProvider : FeatureProvider
     {
+        const string ProviderName = "flagd Provider";
         static int EventStreamRetryBaseBackoff = 1;
         private readonly FlagdConfig _config;
         private readonly Service.ServiceClient _client;
-        private readonly Metadata _providerMetadata = new Metadata("flagd Provider");
+        private readonly Metadata _providerMetadata = new Metadata(ProviderName);
 
         private readonly ICache<string, object> _cache;
         private int _eventStreamRetries;
@@ -91,7 +92,7 @@ public FlagdProvider(FlagdConfig config)
                 _cache = new LRUCache<string, object>(_config.MaxCacheSize);
                 Task.Run(async () =>
                 {
-                    await HandleEvents();
+                    await HandleEvents().ConfigureAwait(false);
                 });
             }
         }
@@ -108,7 +109,7 @@ internal FlagdProvider(Service.ServiceClient client, FlagdConfig config, ICache<
             {
                 Task.Run(async () =>
                 {
-                    await HandleEvents();
+                    await HandleEvents().ConfigureAwait(false);
                 });
             }
         }
@@ -121,7 +122,7 @@ internal FlagdProvider(Service.ServiceClient client, FlagdConfig config, ICache<
         /// </summary>
         public static string GetProviderName()
         {
-            return Api.Instance.GetProviderMetadata().Name;
+            return ProviderName;
         }
 
         /// <summary>
@@ -149,7 +150,7 @@ public override async Task<ResolutionDetails<bool>> ResolveBooleanValue(string f
                 {
                     Context = contextStruct,
                     FlagKey = flagKey
-                });
+                }).ConfigureAwait(false);
 
                 return new ResolutionDetails<bool>(
                     flagKey: flagKey,
@@ -157,7 +158,7 @@ public override async Task<ResolutionDetails<bool>> ResolveBooleanValue(string f
                     reason: resolveBooleanResponse.Reason,
                     variant: resolveBooleanResponse.Variant
                 );
-            }, context);
+            }, context).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -175,7 +176,7 @@ public override async Task<ResolutionDetails<string>> ResolveStringValue(string
                 {
                     Context = contextStruct,
                     FlagKey = flagKey
-                });
+                }).ConfigureAwait(false);
 
                 return new ResolutionDetails<string>(
                     flagKey: flagKey,
@@ -183,7 +184,7 @@ public override async Task<ResolutionDetails<string>> ResolveStringValue(string
                     reason: resolveStringResponse.Reason,
                     variant: resolveStringResponse.Variant
                 );
-            }, context);
+            }, context).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -201,7 +202,7 @@ public override async Task<ResolutionDetails<int>> ResolveIntegerValue(string fl
                 {
                     Context = contextStruct,
                     FlagKey = flagKey
-                });
+                }).ConfigureAwait(false);
 
                 return new ResolutionDetails<int>(
                     flagKey: flagKey,
@@ -209,7 +210,7 @@ public override async Task<ResolutionDetails<int>> ResolveIntegerValue(string fl
                     reason: resolveIntResponse.Reason,
                     variant: resolveIntResponse.Variant
                 );
-            }, context);
+            }, context).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -227,7 +228,7 @@ public override async Task<ResolutionDetails<double>> ResolveDoubleValue(string
                 {
                     Context = contextStruct,
                     FlagKey = flagKey
-                });
+                }).ConfigureAwait(false);
 
                 return new ResolutionDetails<double>(
                     flagKey: flagKey,
@@ -235,7 +236,7 @@ public override async Task<ResolutionDetails<double>> ResolveDoubleValue(string
                     reason: resolveDoubleResponse.Reason,
                     variant: resolveDoubleResponse.Variant
                 );
-            }, context);
+            }, context).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -253,7 +254,7 @@ public override async Task<ResolutionDetails<Value>> ResolveStructureValue(strin
                 {
                     Context = contextStruct,
                     FlagKey = flagKey
-                });
+                }).ConfigureAwait(false);
 
                 return new ResolutionDetails<Value>(
                     flagKey: flagKey,
@@ -261,7 +262,7 @@ public override async Task<ResolutionDetails<Value>> ResolveStructureValue(strin
                     reason: resolveObjectResponse.Reason,
                     variant: resolveObjectResponse.Variant
                 );
-            }, context);
+            }, context).ConfigureAwait(false);
         }
 
         private async Task<ResolutionDetails<T>> ResolveValue<T>(string flagKey, Func<Struct, Task<ResolutionDetails<T>>> resolveDelegate, EvaluationContext context = null)
@@ -277,9 +278,9 @@ private async Task<ResolutionDetails<T>> ResolveValue<T>(string flagKey, Func<St
                         return (ResolutionDetails<T>)value;
                     }
                 }
-                var result = await resolveDelegate.Invoke(ConvertToContext(context));
+                var result = await resolveDelegate.Invoke(ConvertToContext(context)).ConfigureAwait(false);
 
-                if (result.Reason.Equals("STATIC") && _config.CacheEnabled)
+                if (string.Equals(result.Reason, "STATIC", StringComparison.Ordinal) && _config.CacheEnabled)
                 {
                     _cache.Add(flagKey, result);
                 }
@@ -320,27 +321,24 @@ private async Task HandleEvents()
                 try
                 {
                     // Read the response stream asynchronously
-                    while (await call.ResponseStream.MoveNext())
+                    while (await call.ResponseStream.MoveNext().ConfigureAwait(false))
                     {
                         var response = call.ResponseStream.Current;
 
-                        switch (response.Type.ToLower())
+                        if (string.Equals(response.Type, "configuration_change", StringComparison.OrdinalIgnoreCase))
+                        {
+                            HandleConfigurationChangeEvent(response.Data);
+                        }
+                        else if (string.Equals(response.Type, "provider_ready", StringComparison.OrdinalIgnoreCase))
                         {
-                            case "configuration_change":
-                                HandleConfigurationChangeEvent(response.Data);
-                                break;
-                            case "provider_ready":
-                                HandleProviderReadyEvent();
-                                break;
-                            default:
-                                break;
+                            HandleProviderReadyEvent();
                         }
                     }
                 }
                 catch (RpcException ex) when (ex.StatusCode == StatusCode.Unavailable)
                 {
                     // Handle the dropped connection by reconnecting and retrying the stream
-                    await HandleErrorEvent();
+                    await HandleErrorEvent().ConfigureAwait(false);
                 }
             }
         }
@@ -395,7 +393,7 @@ private async Task HandleErrorEvent()
             }
             _eventStreamRetryBackoff = _eventStreamRetryBackoff * 2;
             _mtx.ReleaseMutex();
-            await Task.Delay(_eventStreamRetryBackoff * 1000);
+            await Task.Delay(_eventStreamRetryBackoff * 1000).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -519,7 +517,7 @@ private static Value ConvertToPrimitiveValue(ProtoValue value)
 
         private Service.ServiceClient BuildClientForPlatform(Uri url)
         {
-            var useUnixSocket = url.ToString().StartsWith("unix://");
+            var useUnixSocket = string.Equals(url.Scheme, "unix", StringComparison.Ordinal);
 
             if (!useUnixSocket)
             {
diff --git a/test/OpenFeature.Contrib.Providers.Flagd.Test/FlagdProviderTest.cs b/test/OpenFeature.Contrib.Providers.Flagd.Test/FlagdProviderTest.cs
index 848a257f..29a77dfc 100644
--- a/test/OpenFeature.Contrib.Providers.Flagd.Test/FlagdProviderTest.cs
+++ b/test/OpenFeature.Contrib.Providers.Flagd.Test/FlagdProviderTest.cs
@@ -65,7 +65,7 @@ public void BuildClientForPlatform_Should_Throw_Exception_For_Unsupported_DotNet
         [Fact]
         public void TestGetProviderName()
         {
-            Assert.Equal("No-op Provider", FlagdProvider.GetProviderName());
+            Assert.Equal("flagd Provider", FlagdProvider.GetProviderName());
         }
 
         [Fact]