diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache
index eeaf5136a..d66f2a7fb 100644
--- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache
+++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-log.mustache
@@ -13,7 +13,7 @@
   "Environment": "^generic:default$",
   "PlatformType": "^Generic$",
   "Service": "^{{serviceName}}$",
-  "Operation": "UnmappedOperation",
+  "Operation": "GET /aws-sdk-call",
   "RemoteService": "AWS::S3",
   "RemoteOperation": "GetBucketLocation",
   "RemoteResourceIdentifier": "^e2e-test-bucket-name-{{testingId}}$",
diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-metric.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-metric.mustache
index f1e7ec629..77b164e47 100644
--- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-metric.mustache
+++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/aws-sdk-call-metric.mustache
@@ -18,7 +18,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -100,7 +100,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -163,7 +163,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -245,7 +245,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -308,7 +308,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
@@ -390,7 +390,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /aws-sdk-call
     -
       name: Service
       value: {{serviceName}}
diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache
index 612b9e17e..1f0a4af0e 100644
--- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache
+++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-log.mustache
@@ -13,7 +13,7 @@
   "Environment": "^generic:default$",
   "PlatformType": "^Generic$",
   "Service": "^{{serviceName}}$",
-  "Operation": "UnmappedOperation",
+  "Operation": "GET /outgoing-http-call",
   "RemoteService": "www.amazon.com",
   "RemoteOperation": "GET /",
   "Host": "^ip(-[0-9]{1,3}){4}.*$"
diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-metric.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-metric.mustache
index a2982bcc4..e1f7a71d8 100644
--- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-metric.mustache
+++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/outgoing-http-call-metric.mustache
@@ -18,7 +18,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
@@ -94,7 +94,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
@@ -170,7 +170,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /outgoing-http-call
     -
       name: Service
       value: {{serviceName}}
diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache
index 6aa7de529..68f99a009 100644
--- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache
+++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-log.mustache
@@ -13,8 +13,8 @@
   "Environment": "^generic:default$",
   "PlatformType": "^Generic$",
   "Service": "^{{serviceName}}$",
-  "Operation": "UnmappedOperation",
-  "RemoteService": "{{remoteServiceIp}}:8080",
+  "Operation": "GET /remote-service",
+  "RemoteService": "{{remoteServiceDeploymentName}}",
   "RemoteOperation": "GET /healthcheck",
   "Host": "^ip(-[0-9]{1,3}){4}.*$"
 }]
\ No newline at end of file
diff --git a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache
index 549fbf006..b58c7f960 100644
--- a/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache
+++ b/validator/src/main/resources/expected-data-template/java/eks-otlp-ocb/remote-service-metric.mustache
@@ -18,7 +18,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -30,7 +30,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Latency
@@ -80,7 +80,7 @@
       value: generic:default
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Latency
@@ -97,7 +97,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Latency
@@ -105,7 +105,7 @@
   dimensions:
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
@@ -127,7 +127,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -139,7 +139,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
@@ -189,7 +189,7 @@
       value: generic:default
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
@@ -206,7 +206,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Error
@@ -214,7 +214,7 @@
   dimensions:
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
@@ -236,7 +236,7 @@
   dimensions:
     -
       name: Operation
-      value: UnmappedOperation
+      value: GET /remote-service
     -
       name: Service
       value: {{serviceName}}
@@ -248,7 +248,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
@@ -298,7 +298,7 @@
       value: generic:default
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
@@ -315,7 +315,7 @@
       value: GET /healthcheck
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}
 
 -
   metricName: Fault
@@ -323,4 +323,4 @@
   dimensions:
     -
       name: RemoteService
-      value: {{remoteServiceIp}}:8080
+      value: {{remoteServiceDeploymentName}}