diff --git a/src/VirtoCommerce.Build/Build.cs b/src/VirtoCommerce.Build/Build.cs
index 22df915..b78c8a3 100644
--- a/src/VirtoCommerce.Build/Build.cs
+++ b/src/VirtoCommerce.Build/Build.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Reflection;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -248,6 +249,8 @@ protected static TelemetryClient TelemetryClient
                 var telemetryConfig = new Microsoft.ApplicationInsights.Extensibility.TelemetryConfiguration();
                 telemetryConfig.ConnectionString = AIConnectionString;
                 _telemetryClient = new TelemetryClient(telemetryConfig);
+                _telemetryClient.Context.Device.OperatingSystem = Environment.OSVersion.ToString();
+                _telemetryClient.Context.Component.Version = Assembly.GetEntryAssembly().GetName().Version.ToString();
             }
             return _telemetryClient;
         }