diff --git a/src/CAVerifierServer.Silo/Extensions/OrleansHostExtensions.cs b/src/CAVerifierServer.Silo/Extensions/OrleansHostExtensions.cs
index 26b0eff..645fcae 100644
--- a/src/CAVerifierServer.Silo/Extensions/OrleansHostExtensions.cs
+++ b/src/CAVerifierServer.Silo/Extensions/OrleansHostExtensions.cs
@@ -24,9 +24,18 @@ public static IHostBuilder UseOrleans(this IHostBuilder hostBuilder)
             throw new ArgumentNullException(nameof(configSection), "The OrleansServer node is missing");
         return hostBuilder.UseOrleans(siloBuilder =>
         {
+            var isRunningInKubernetes = configSection.GetValue<bool>("isRunningInKubernetes");
+            var advertisedIP = isRunningInKubernetes ?  Environment.GetEnvironmentVariable("POD_IP") :configSection.GetValue<string>("AdvertisedIP");
+            var clusterId = isRunningInKubernetes ? Environment.GetEnvironmentVariable("ORLEANS_CLUSTER_ID") : configSection.GetValue<string>("ClusterId");
+            var serviceId = isRunningInKubernetes ? Environment.GetEnvironmentVariable("ORLEANS_SERVICE_ID") : configSection.GetValue<string>("ServiceId");
+
             //Configure OrleansSnapshot
             siloBuilder
-                .ConfigureEndpoints(advertisedIP:IPAddress.Parse(configSection.GetValue<string>("AdvertisedIP")),siloPort: configSection.GetValue<int>("SiloPort"), gatewayPort: configSection.GetValue<int>("GatewayPort"), listenOnAnyHostAddress: true)
+                //.ConfigureEndpoints(advertisedIP:IPAddress.Parse(configSection.GetValue<string>("AdvertisedIP")),siloPort: configSection.GetValue<int>("SiloPort"), gatewayPort: configSection.GetValue<int>("GatewayPort"), listenOnAnyHostAddress: true)
+                .ConfigureEndpoints(advertisedIP: IPAddress.Parse(advertisedIP),
+                    siloPort: configSection.GetValue<int>("SiloPort"),
+                    gatewayPort: configSection.GetValue<int>("GatewayPort"), listenOnAnyHostAddress: true)
+
                 .UseMongoDBClient(configSection.GetValue<string>("MongoDBClient"))
                 .UseMongoDBClustering(options =>
                 {
@@ -54,8 +63,8 @@ public static IHostBuilder UseOrleans(this IHostBuilder hostBuilder)
                 })
                 .Configure<ClusterOptions>(options =>
                 {
-                    options.ClusterId = configSection.GetValue<string>("ClusterId");
-                    options.ServiceId = configSection.GetValue<string>("ServiceId");
+                    options.ClusterId = clusterId;
+                    options.ServiceId = serviceId;
                 })
                // .AddMemoryGrainStorage("PubSubStore")
                 .ConfigureApplicationParts(parts => parts.AddFromApplicationBaseDirectory())