diff --git a/src/Bss.Platform.Kubernetes/DependencyInjection.cs b/src/Bss.Platform.Kubernetes/DependencyInjection.cs
index 6c11441..50dca89 100644
--- a/src/Bss.Platform.Kubernetes/DependencyInjection.cs
+++ b/src/Bss.Platform.Kubernetes/DependencyInjection.cs
@@ -1,4 +1,4 @@
-using Bss.Platform.Kubernetes.Services;
+using Bss.Platform.Kubernetes.Services;
 
 using Microsoft.ApplicationInsights.DependencyCollector;
 using Microsoft.ApplicationInsights.Extensibility;
@@ -36,6 +36,7 @@ public static IServiceCollection AddPlatformKubernetesInsights(this IServiceColl
         }
 
         services.AddSingleton<ITelemetryInitializer, TelemetryDataEnrichInitializer>();
+        services.AddSingleton<ITelemetryInitializer, CloudRoleNameTelemetryInitializer>();
 
         return services
             .AddApplicationInsightsTelemetry(configuration)
diff --git a/src/Bss.Platform.Kubernetes/Services/CloudRoleNameTelemetryInitializer.cs b/src/Bss.Platform.Kubernetes/Services/CloudRoleNameTelemetryInitializer.cs
new file mode 100644
index 0000000..be5b3ce
--- /dev/null
+++ b/src/Bss.Platform.Kubernetes/Services/CloudRoleNameTelemetryInitializer.cs
@@ -0,0 +1,16 @@
+using Microsoft.ApplicationInsights.Channel;
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.Extensions.Options;
+
+namespace Bss.Platform.Kubernetes.Services;
+
+internal class CloudRoleNameTelemetryInitializer(IOptions<KubernetesInsightsOptions> options) : ITelemetryInitializer
+{
+    public void Initialize(ITelemetry telemetry)
+    {
+        if (string.IsNullOrEmpty(telemetry.Context.Cloud.RoleName))
+        {
+            telemetry.Context.Cloud.RoleName = options.Value.RoleName;
+        }
+    }
+}
diff --git a/src/Bss.Platform.Kubernetes/Services/TelemetryDataEnrichInitializer.cs b/src/Bss.Platform.Kubernetes/Services/TelemetryDataEnrichInitializer.cs
index 32418c1..a0dc6dc 100644
--- a/src/Bss.Platform.Kubernetes/Services/TelemetryDataEnrichInitializer.cs
+++ b/src/Bss.Platform.Kubernetes/Services/TelemetryDataEnrichInitializer.cs
@@ -1,9 +1,6 @@
-using System.Reflection;
-
 using Microsoft.ApplicationInsights.AspNetCore.TelemetryInitializers;
 using Microsoft.ApplicationInsights.Channel;
 using Microsoft.ApplicationInsights.DataContracts;
-using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
@@ -19,10 +16,5 @@ protected override void OnInitializeTelemetry(HttpContext platformContext, Reque
         {
             telemetry.Context.User.AuthenticatedUserId = username;
         }
-
-        if (string.IsNullOrEmpty(telemetry.Context.Cloud.RoleName))
-        {
-            telemetry.Context.Cloud.RoleName = options.Value.RoleName;
-        }
     }
 }
diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs
index 0d9c75a..d0adb52 100644
--- a/src/__SolutionItems/CommonAssemblyInfo.cs
+++ b/src/__SolutionItems/CommonAssemblyInfo.cs
@@ -4,9 +4,9 @@
 [assembly: AssemblyCompany("Luxoft")]
 [assembly: AssemblyCopyright("Copyright © Luxoft 2025")]
 
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
-[assembly: AssemblyInformationalVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
+[assembly: AssemblyInformationalVersion("1.6.1.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]