diff --git a/pkg/connector/app.go b/pkg/connector/app.go
index 186f7fbe..c192eb22 100644
--- a/pkg/connector/app.go
+++ b/pkg/connector/app.go
@@ -192,6 +192,10 @@ func (o *appResourceType) listAppGroupGrants(
 					Id: fmtGrantIdV1(V1MembershipEntitlementID(resource.Id.Resource), groupID),
 				},
 			),
+			sdkGrant.WithAnnotation(&v2.GrantExpandable{
+				EntitlementIds: []string{fmt.Sprintf("group:%s:member", groupID)},
+				Shallow:        true,
+			}),
 		))
 	}
 
@@ -228,6 +232,10 @@ func (o *appResourceType) listAppUsersGrants(
 			continue
 		}
 
+		if strings.EqualFold(applicationUser.Scope, "GROUP") {
+			continue
+		}
+
 		userID := applicationUser.Id
 		principalID := &v2.ResourceId{ResourceType: resourceTypeUser.Id, Resource: userID}
 		rv = append(rv, sdkGrant.NewGrant(resource, "access", principalID,