diff --git a/app/Program.cs b/app/Program.cs
index 5273111..d04dc9d 100644
--- a/app/Program.cs
+++ b/app/Program.cs
@@ -3,7 +3,9 @@
 var builder = WebApplication.CreateSlimBuilder(args);
 var app = builder.Build();
 
-var message = builder.Configuration["MESSAGE"];
+var message = builder.Configuration["MESSAGE"] ?? "Hello, World!";
+var podName = builder.Configuration["POD_NAME"];
+var namespaceName = builder.Configuration["NAMESPACE_NAME"];
 
-app.MapGet("/", () => message ?? "Hello, World!");
+app.MapGet("/", () => string.IsNullOrEmpty(podName) || string.IsNullOrEmpty(namespaceName) ? message : $"{message} - from {podName} / {namespaceName}.");
 app.Run();
diff --git a/score/score.yaml b/score/score.yaml
index 1e05cc4..86a36d9 100644
--- a/score/score.yaml
+++ b/score/score.yaml
@@ -6,6 +6,8 @@ containers:
     image: my-sample-app
     variables:
       MESSAGE: "Hello, World!"
+      POD_NAME: "${pod.metadata.name}"
+      NAMESPACE_NAME: "${pod.metadata.namespace}"
 resources:
   dns: 
     type: dns