diff --git a/services/collaboration/pkg/middleware/tracing.go b/services/collaboration/pkg/middleware/tracing.go
index 66fc64f579..bd3069eb1b 100644
--- a/services/collaboration/pkg/middleware/tracing.go
+++ b/services/collaboration/pkg/middleware/tracing.go
@@ -41,6 +41,7 @@ func CollaborationTracingMiddleware(next http.Handler) http.Handler {
 
 		if wopiUser, ok := ctxpkg.ContextGetUser(r.Context()); ok {
 			attrs = append(attrs, []attribute.KeyValue{
+				attribute.String("enduser.id", wopiUser.GetId().GetOpaqueId()),
 				attribute.String("cs3.user.idp", wopiUser.GetId().GetIdp()),
 				attribute.String("cs3.user.opaque", wopiUser.GetId().GetOpaqueId()),
 				attribute.String("cs3.user.type", wopiUser.GetId().GetType().String()),
diff --git a/services/proxy/pkg/middleware/account_resolver.go b/services/proxy/pkg/middleware/account_resolver.go
index 0ad054192e..ae55d5521d 100644
--- a/services/proxy/pkg/middleware/account_resolver.go
+++ b/services/proxy/pkg/middleware/account_resolver.go
@@ -10,6 +10,7 @@ import (
 	"github.com/opencloud-eu/opencloud/services/proxy/pkg/router"
 	"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
 	"github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles"
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 
 	cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -235,6 +236,8 @@ func (m accountResolver) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		}
 	}
 
+	span.SetAttributes(attribute.String("enduser.id", user.GetId().GetOpaqueId()))
+
 	ri := router.ContextRoutingInfo(ctx)
 	if ri.RemoteUserHeader() != "" {
 		req.Header.Set(ri.RemoteUserHeader(), user.GetId().GetOpaqueId())
diff --git a/services/proxy/pkg/middleware/public_share_auth.go b/services/proxy/pkg/middleware/public_share_auth.go
index 562958e4d5..047a332527 100644
--- a/services/proxy/pkg/middleware/public_share_auth.go
+++ b/services/proxy/pkg/middleware/public_share_auth.go
@@ -8,6 +8,8 @@ import (
 	"github.com/opencloud-eu/opencloud/pkg/log"
 	revactx "github.com/opencloud-eu/reva/v2/pkg/ctx"
 	"github.com/opencloud-eu/reva/v2/pkg/rgrpc/todo/pool"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 const (
@@ -121,6 +123,8 @@ func (a PublicShareAuthenticator) Authenticate(r *http.Request) (*http.Request,
 
 	r.Header.Add(headerRevaAccessToken, authResp.Token)
 
+	trace.SpanFromContext(r.Context()).SetAttributes(attribute.String("enduser.id", "public"))
+
 	a.Logger.Debug().
 		Str("authenticator", "public_share").
 		Str("path", r.URL.Path).