diff --git a/opampserver/pkg/server/handlers.go b/opampserver/pkg/server/handlers.go
index b42d49eb3..1d8092689 100644
--- a/opampserver/pkg/server/handlers.go
+++ b/opampserver/pkg/server/handlers.go
@@ -215,7 +215,7 @@ func extractOpampAgentAttributes(agentDescription *protobufs.AgentDescription) o
 		switch attr.Key {
 		case string(semconv.TelemetrySDKLanguageKey):
 			result.ProgrammingLanguage = attr.Value.GetStringValue()
-		case string(semconv.ContainerNameKey):
+		case string(semconv.K8SContainerNameKey):
 			result.ContainerName = attr.Value.GetStringValue()
 		case string(semconv.K8SPodNameKey):
 			result.PodName = attr.Value.GetStringValue()
@@ -250,8 +250,8 @@ func resolveFromDirectAttributes(ctx context.Context, attrs opampAgentAttributes
 		}
 	}
 
-	serviceName := podInfoResolver.ResolveServiceName(ctx, attrs.PodName, workloadName, &di.ContainerDetails{
-		PodName: attrs.PodName,
+	serviceName := podInfoResolver.ResolveServiceName(ctx, workloadName, string(workloadKind), &di.ContainerDetails{
+		PodNamespace: attrs.Namespace,
 	})
 
 	k8sAttributes := &di.K8sResourceAttributes{