diff --git a/packages/server/modules/accessrequests/graph/resolvers/index.ts b/packages/server/modules/accessrequests/graph/resolvers/index.ts
index 07825f5b8..e60565270 100644
--- a/packages/server/modules/accessrequests/graph/resolvers/index.ts
+++ b/packages/server/modules/accessrequests/graph/resolvers/index.ts
@@ -21,6 +21,7 @@ import { mapStreamRoleToValue } from '@/modules/core/helpers/graphTypes'
 import { Roles } from '@/modules/core/helpers/mainConstants'
 import {
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
@@ -69,6 +70,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
diff --git a/packages/server/modules/accessrequests/tests/projectAccessRequests.spec.ts b/packages/server/modules/accessrequests/tests/projectAccessRequests.spec.ts
index 5cf27f1ab..0dfebe498 100644
--- a/packages/server/modules/accessrequests/tests/projectAccessRequests.spec.ts
+++ b/packages/server/modules/accessrequests/tests/projectAccessRequests.spec.ts
@@ -12,7 +12,9 @@ import {
   requestProjectAccessFactory
 } from '@/modules/accessrequests/services/stream'
 import { StreamActionTypes } from '@/modules/activitystream/helpers/types'
+import { getActivitiesFactory } from '@/modules/activitystream/repositories/index'
 import {
+  Activity,
   ServerAccessRequests,
   StreamActivity,
   Streams,
@@ -24,6 +26,7 @@ import { Roles } from '@/modules/core/helpers/mainConstants'
 import {
   getStreamCollaboratorsFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory,
   revokeStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
@@ -79,15 +82,17 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
-
 const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
+const getActivities = getActivitiesFactory({ db })
 
 const isNotCollaboratorError = (e: unknown) =>
   e instanceof StreamAccessUpdateError &&
@@ -406,7 +411,11 @@ describe('Project access requests', () => {
     let validReqId: string
 
     beforeEach(async () => {
-      await truncateTables([ServerAccessRequests.name, StreamActivity.name])
+      await truncateTables([
+        ServerAccessRequests.name,
+        StreamActivity.name,
+        Activity.name
+      ])
       await removeStreamCollaborator(
         myPrivateStream.id,
         otherGuy.id,
@@ -464,8 +473,8 @@ describe('Project access requests', () => {
 
         // activity stream item should be inserted
         if (accept) {
-          const streamActivity = await getStreamActivities(myPrivateStream.id, {
-            actionType: StreamActionTypes.Stream.PermissionsAdd,
+          const streamActivity = await getActivities({
+            projectId: myPrivateStream.id,
             userId: me.id
           })
           expect(streamActivity).to.have.lengthOf(1)
diff --git a/packages/server/modules/accessrequests/tests/streamAccessRequests.spec.ts b/packages/server/modules/accessrequests/tests/streamAccessRequests.spec.ts
index fdd44568a..c15ec29c3 100644
--- a/packages/server/modules/accessrequests/tests/streamAccessRequests.spec.ts
+++ b/packages/server/modules/accessrequests/tests/streamAccessRequests.spec.ts
@@ -13,7 +13,9 @@ import {
   requestStreamAccessFactory
 } from '@/modules/accessrequests/services/stream'
 import { StreamActionTypes } from '@/modules/activitystream/helpers/types'
+import { getActivitiesFactory } from '@/modules/activitystream/repositories/index'
 import {
+  Activity,
   ServerAccessRequests,
   StreamActivity,
   Streams,
@@ -25,6 +27,7 @@ import { Roles } from '@/modules/core/helpers/mainConstants'
 import {
   getStreamCollaboratorsFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory,
   revokeStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
@@ -82,6 +85,7 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -89,8 +93,10 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
+const getActivities = getActivitiesFactory({ db })
 
 const isNotCollaboratorError = (e: unknown) =>
   e instanceof StreamAccessUpdateError &&
@@ -375,7 +381,11 @@ describe('Stream access requests', () => {
     let validReqId: string
 
     beforeEach(async () => {
-      await truncateTables([ServerAccessRequests.name, StreamActivity.name])
+      await truncateTables([
+        ServerAccessRequests.name,
+        StreamActivity.name,
+        Activity.name
+      ])
       await removeStreamCollaborator(
         myPrivateStream.id,
         otherGuy.id,
@@ -424,9 +434,10 @@ describe('Stream access requests', () => {
 
         // activity stream item should be inserted
         if (accept) {
-          const streamActivity = await getStreamActivities(myPrivateStream.id, {
-            actionType: StreamActionTypes.Stream.PermissionsAdd,
-            userId: me.id
+          const streamActivity = await getActivities({
+            projectId: myPrivateStream.id,
+            userId: me.id,
+            eventType: 'project_role_updated'
           })
           expect(streamActivity).to.have.lengthOf(1)
 
diff --git a/packages/server/modules/activitystream/domain/operations.ts b/packages/server/modules/activitystream/domain/operations.ts
index 3957d85ab..2692483fe 100644
--- a/packages/server/modules/activitystream/domain/operations.ts
+++ b/packages/server/modules/activitystream/domain/operations.ts
@@ -1,4 +1,5 @@
 import {
+  Activity,
   ActivitySummary,
   CommentCreatedActivityInput,
   ReplyCreatedActivityInput,
@@ -7,7 +8,6 @@ import {
   StreamActionType
 } from '@/modules/activitystream/domain/types'
 import {
-  Activity,
   StreamActivityRecord,
   StreamScopeActivity
 } from '@/modules/activitystream/helpers/types'
@@ -32,7 +32,7 @@ import {
 } from '@/modules/core/helpers/types'
 import { Nullable } from '@speckle/shared'
 
-export type GetActivity = (
+export type GetUserStreamActivity = (
   streamId: string,
   start: Date,
   end: Date,
@@ -281,3 +281,12 @@ export type SaveActivity = <
 >(
   args: Omit<Activity<T, R>, 'createdAt' | 'id'>
 ) => Promise<Activity<T, R>>
+
+type GetActivitiesArgs = Partial<{
+  workspaceId: string
+  projectId: string
+  eventType: string
+  userId: string
+}>
+
+export type GetActivities = (filters: GetActivitiesArgs) => Promise<Activity[]>
diff --git a/packages/server/modules/activitystream/domain/types.ts b/packages/server/modules/activitystream/domain/types.ts
index 277ee4208..f355d67e0 100644
--- a/packages/server/modules/activitystream/domain/types.ts
+++ b/packages/server/modules/activitystream/domain/types.ts
@@ -23,6 +23,23 @@ export type ResourceEventsToPayloadMap = {
     workspace_seat_updated: z.infer<typeof WorkspaceSeatUpdatedActivity>
     workspace_seat_deleted: z.infer<typeof WorkspaceSeatDeletedActivity>
   }
+  project: {
+    project_role_updated: z.infer<typeof ProjectRoleUpdatedActivity>
+    project_role_deleted: z.infer<typeof ProjectRoleDeletedActivity>
+  }
+}
+
+export interface Activity<
+  T extends keyof ResourceEventsToPayloadMap = keyof ResourceEventsToPayloadMap,
+  R extends keyof ResourceEventsToPayloadMap[T] = keyof ResourceEventsToPayloadMap[T]
+> {
+  id: string
+  contextResourceId: string
+  contextResourceType: T
+  eventType: R
+  userId: string | null
+  payload: ResourceEventsToPayloadMap[T][R]
+  createdAt: Date
 }
 
 const workspacePlan = z.object({
@@ -56,6 +73,12 @@ const workspaceSubscription = z.object({
   totalEditorSeats: z.number()
 })
 
+const projectRole = z.union([
+  z.literal('stream:owner'),
+  z.literal('stream:contributor'),
+  z.literal('stream:reviewer')
+])
+
 export const WorkspacePlanCreatedActivity = z.object({
   version: z.literal('1'),
   new: workspacePlan
@@ -84,6 +107,19 @@ export const WorkspaceSeatDeletedActivity = z.object({
   old: workspaceSeat
 })
 
+export const ProjectRoleUpdatedActivity = z.object({
+  version: z.literal('1'),
+  userId: z.string(),
+  new: projectRole,
+  old: z.nullable(projectRole)
+})
+
+export const ProjectRoleDeletedActivity = z.object({
+  version: z.literal('1'),
+  userId: z.string(),
+  old: projectRole
+})
+
 // Stream Activity
 
 export type StreamActionType =
diff --git a/packages/server/modules/activitystream/events/accessRequestListeners.ts b/packages/server/modules/activitystream/events/accessRequestListeners.ts
index 7931463fb..921139106 100644
--- a/packages/server/modules/activitystream/events/accessRequestListeners.ts
+++ b/packages/server/modules/activitystream/events/accessRequestListeners.ts
@@ -19,13 +19,13 @@ import {
  */
 const addStreamAccessRequestedActivityFactory =
   ({
-    saveActivity
+    saveStreamActivity
   }: {
-    saveActivity: SaveStreamActivity
+    saveStreamActivity: SaveStreamActivity
   }): AddStreamAccessRequestedActivity =>
   async (params: { streamId: string; requesterId: string }) => {
     const { streamId, requesterId } = params
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Stream,
       resourceId: streamId,
@@ -41,13 +41,13 @@ const addStreamAccessRequestedActivityFactory =
  */
 const addStreamAccessRequestDeclinedActivityFactory =
   ({
-    saveActivity
+    saveStreamActivity
   }: {
-    saveActivity: SaveStreamActivity
+    saveStreamActivity: SaveStreamActivity
   }): AddStreamAccessRequestDeclinedActivity =>
   async (params: { streamId: string; requesterId: string; declinerId: string }) => {
     const { streamId, requesterId, declinerId } = params
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Stream,
       resourceId: streamId,
@@ -104,7 +104,8 @@ const onServerAccessRequestFinalizedFactory =
   }
 
 export const reportAccessRequestActivityFactory =
-  (deps: { eventListen: EventBusListen; saveActivity: SaveStreamActivity }) => () => {
+  (deps: { eventListen: EventBusListen; saveStreamActivity: SaveStreamActivity }) =>
+  () => {
     const addStreamAccessRequestedActivity =
       addStreamAccessRequestedActivityFactory(deps)
     const addStreamAccessRequestDeclinedActivity =
diff --git a/packages/server/modules/activitystream/events/branchListeners.ts b/packages/server/modules/activitystream/events/branchListeners.ts
index 9a1bad24d..537688ad5 100644
--- a/packages/server/modules/activitystream/events/branchListeners.ts
+++ b/packages/server/modules/activitystream/events/branchListeners.ts
@@ -16,11 +16,15 @@ import { EventBusListen } from '@/modules/shared/services/eventBus'
  * Save "branch created" activity
  */
 const addBranchCreatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddBranchCreatedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddBranchCreatedActivity =>
   async (params) => {
     const { branch } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId: branch.streamId,
       resourceType: StreamResourceTypes.Branch,
       resourceId: branch.id,
@@ -32,12 +36,16 @@ const addBranchCreatedActivityFactory =
   }
 
 const addBranchUpdatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddBranchUpdatedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddBranchUpdatedActivity =>
   async (params) => {
     const { update, userId, oldBranch } = params
 
     const streamId = isBranchUpdateInput(update) ? update.streamId : update.projectId
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Branch,
       resourceId: update.id,
@@ -49,13 +57,17 @@ const addBranchUpdatedActivityFactory =
   }
 
 const addBranchDeletedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddBranchDeletedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddBranchDeletedActivity =>
   async (params) => {
     const { input, userId, branchName } = params
 
     const streamId = isBranchDeleteInput(input) ? input.streamId : input.projectId
     await Promise.all([
-      saveActivity({
+      saveStreamActivity({
         streamId,
         resourceType: StreamResourceTypes.Branch,
         resourceId: input.id,
@@ -68,7 +80,8 @@ const addBranchDeletedActivityFactory =
   }
 
 export const reportBranchActivityFactory =
-  (deps: { eventListen: EventBusListen; saveActivity: SaveStreamActivity }) => () => {
+  (deps: { eventListen: EventBusListen; saveStreamActivity: SaveStreamActivity }) =>
+  () => {
     const addBranchCreatedActivity = addBranchCreatedActivityFactory(deps)
     const addBranchUpdatedActivity = addBranchUpdatedActivityFactory(deps)
     const addBranchDeletedActivity = addBranchDeletedActivityFactory(deps)
diff --git a/packages/server/modules/activitystream/events/commentListeners.ts b/packages/server/modules/activitystream/events/commentListeners.ts
index e588d7e75..44b004933 100644
--- a/packages/server/modules/activitystream/events/commentListeners.ts
+++ b/packages/server/modules/activitystream/events/commentListeners.ts
@@ -19,11 +19,15 @@ import { has } from 'lodash'
 import { OverrideProperties } from 'type-fest'
 
 const addThreadCreatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddThreadCreatedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddThreadCreatedActivity =>
   async (params) => {
     const { input, comment } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       resourceId: comment.id,
       streamId: comment.streamId,
       resourceType: StreamResourceTypes.Comment,
@@ -39,14 +43,18 @@ const isLegacyReplyCreateInput = (
 ): i is ReplyCreateInput => has(i, 'streamId')
 
 const addReplyAddedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddReplyAddedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddReplyAddedActivity =>
   async (params) => {
     const { input, reply } = params
 
     const parentCommentId = isLegacyReplyCreateInput(input)
       ? input.parentComment
       : input.threadId
-    await saveActivity({
+    await saveStreamActivity({
       streamId: reply.streamId,
       resourceType: StreamResourceTypes.Comment,
       resourceId: parentCommentId,
@@ -59,14 +67,14 @@ const addReplyAddedActivityFactory =
 
 const addCommentArchivedActivityFactory =
   ({
-    saveActivity
+    saveStreamActivity
   }: {
-    saveActivity: SaveStreamActivity
+    saveStreamActivity: SaveStreamActivity
   }): AddCommentArchivedActivity =>
   async (params) => {
     const { userId, input, comment } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId: comment.streamId,
       resourceType: StreamResourceTypes.Comment,
       resourceId: comment.id,
@@ -100,7 +108,8 @@ const isThreadCreatedPayload = (
 }
 
 export const reportCommentActivityFactory =
-  (deps: { eventListen: EventBusListen; saveActivity: SaveStreamActivity }) => () => {
+  (deps: { eventListen: EventBusListen; saveStreamActivity: SaveStreamActivity }) =>
+  () => {
     const addThreadCreatedActivity = addThreadCreatedActivityFactory(deps)
     const addReplyAddedActivity = addReplyAddedActivityFactory(deps)
     const addCommentArchivedActivity = addCommentArchivedActivityFactory(deps)
diff --git a/packages/server/modules/activitystream/events/commitListeners.ts b/packages/server/modules/activitystream/events/commitListeners.ts
index fb3ddd9a5..6bd25752a 100644
--- a/packages/server/modules/activitystream/events/commitListeners.ts
+++ b/packages/server/modules/activitystream/events/commitListeners.ts
@@ -18,7 +18,11 @@ import { MaybeNullOrUndefined } from '@speckle/shared'
  * Save "new commit created" activity item
  */
 const addCommitCreatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddCommitCreatedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddCommitCreatedActivity =>
   async (params: {
     commitId: string
     streamId: string
@@ -29,7 +33,7 @@ const addCommitCreatedActivityFactory =
     commit: CommitRecord
   }) => {
     const { commitId, input, streamId, userId, branchName, commit, modelId } = params
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Commit,
       resourceId: commitId,
@@ -49,11 +53,15 @@ const addCommitCreatedActivityFactory =
   }
 
 const addCommitUpdatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddCommitUpdatedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddCommitUpdatedActivity =>
   async (params) => {
     const { commitId, streamId, userId, originalCommit, update } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Commit,
       resourceId: commitId,
@@ -65,7 +73,7 @@ const addCommitUpdatedActivityFactory =
   }
 
 const addCommitMovedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
+  ({ saveStreamActivity }: { saveStreamActivity: SaveStreamActivity }) =>
   async (params: {
     commitId: string
     streamId: string
@@ -75,7 +83,7 @@ const addCommitMovedActivityFactory =
     commit: CommitRecord
   }) => {
     const { commitId, streamId, userId, originalBranchId, newBranchId } = params
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Commit,
       resourceId: commitId,
@@ -87,7 +95,11 @@ const addCommitMovedActivityFactory =
   }
 
 const addCommitDeletedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddCommitDeletedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddCommitDeletedActivity =>
   async (params: {
     commitId: string
     streamId: string
@@ -96,7 +108,7 @@ const addCommitDeletedActivityFactory =
     branchId: string
   }) => {
     const { commitId, streamId, userId, commit } = params
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Commit,
       resourceId: commitId,
@@ -108,7 +120,7 @@ const addCommitDeletedActivityFactory =
   }
 
 const addCommitReceivedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
+  ({ saveStreamActivity }: { saveStreamActivity: SaveStreamActivity }) =>
   async (params: {
     streamId: string
     commitId: string
@@ -117,7 +129,7 @@ const addCommitReceivedActivityFactory =
     message: MaybeNullOrUndefined<string>
   }) => {
     const { streamId, commitId, userId, sourceApplication, message } = params
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Commit,
       resourceId: commitId,
@@ -132,7 +144,8 @@ const addCommitReceivedActivityFactory =
   }
 
 export const reportCommitActivityFactory =
-  (deps: { eventListen: EventBusListen; saveActivity: SaveStreamActivity }) => () => {
+  (deps: { eventListen: EventBusListen; saveStreamActivity: SaveStreamActivity }) =>
+  () => {
     const addCommitCreatedActivity = addCommitCreatedActivityFactory(deps)
     const addCommitUpdatedActivity = addCommitUpdatedActivityFactory(deps)
     const addCommitMovedActivity = addCommitMovedActivityFactory(deps)
diff --git a/packages/server/modules/activitystream/events/streamInviteListeners.ts b/packages/server/modules/activitystream/events/streamInviteListeners.ts
index 35b27da81..fb2d35741 100644
--- a/packages/server/modules/activitystream/events/streamInviteListeners.ts
+++ b/packages/server/modules/activitystream/events/streamInviteListeners.ts
@@ -18,7 +18,7 @@ import { Roles } from '@speckle/shared'
  */
 const addStreamInviteSentOutActivityFactory =
   (deps: {
-    saveActivity: SaveStreamActivity
+    saveStreamActivity: SaveStreamActivity
     getProjectInviteProject: GetProjectInviteProject
   }) =>
   async (payload: EventPayload<typeof ServerInvitesEvents.Created>) => {
@@ -29,7 +29,7 @@ const addStreamInviteSentOutActivityFactory =
     const userTarget = resolveTarget(invite.target)
     const targetDisplay = userTarget.userId || userTarget.userEmail
 
-    await deps.saveActivity({
+    await deps.saveStreamActivity({
       streamId: project.id,
       resourceType: StreamResourceTypes.Stream,
       resourceId: project.id,
@@ -48,7 +48,7 @@ const addStreamInviteSentOutActivityFactory =
  */
 const addStreamInviteAcceptedActivityFactory =
   (deps: {
-    saveActivity: SaveStreamActivity
+    saveStreamActivity: SaveStreamActivity
     getProjectInviteProject: GetProjectInviteProject
   }) =>
   async (payload: EventPayload<typeof ServerInvitesEvents.Finalized>) => {
@@ -63,7 +63,7 @@ const addStreamInviteAcceptedActivityFactory =
 
     const differentFinalizer = trueFinalizerUserId !== userTarget.userId
 
-    await deps.saveActivity({
+    await deps.saveStreamActivity({
       streamId: project.id,
       resourceType: StreamResourceTypes.Stream,
       resourceId: project.id,
@@ -81,7 +81,7 @@ const addStreamInviteAcceptedActivityFactory =
  */
 const addStreamInviteDeclinedActivityFactory =
   (deps: {
-    saveActivity: SaveStreamActivity
+    saveStreamActivity: SaveStreamActivity
     getProjectInviteProject: GetProjectInviteProject
   }) =>
   async (payload: EventPayload<typeof ServerInvitesEvents.Finalized>) => {
@@ -90,7 +90,7 @@ const addStreamInviteDeclinedActivityFactory =
     if (!project) return
 
     const userTarget = resolveTarget(invite.target)
-    await deps.saveActivity({
+    await deps.saveStreamActivity({
       streamId: project.id,
       resourceType: StreamResourceTypes.Stream,
       resourceId: project.id,
@@ -104,7 +104,7 @@ const addStreamInviteDeclinedActivityFactory =
 export const reportStreamInviteActivityFactory =
   (deps: {
     eventListen: EventBusListen
-    saveActivity: SaveStreamActivity
+    saveStreamActivity: SaveStreamActivity
     getProjectInviteProject: GetProjectInviteProject
   }) =>
   () => {
diff --git a/packages/server/modules/activitystream/events/streamListeners.ts b/packages/server/modules/activitystream/events/streamListeners.ts
index b93b15db2..b9124eafd 100644
--- a/packages/server/modules/activitystream/events/streamListeners.ts
+++ b/packages/server/modules/activitystream/events/streamListeners.ts
@@ -1,6 +1,7 @@
 import {
   AddStreamDeletedActivity,
   AddStreamUpdatedActivity,
+  SaveActivity,
   SaveStreamActivity
 } from '@/modules/activitystream/domain/operations'
 import {
@@ -13,14 +14,54 @@ import {
   StreamCreateInput
 } from '@/modules/core/graph/generated/graphql'
 import { StreamRecord } from '@/modules/core/helpers/types'
-import { EventBusListen } from '@/modules/shared/services/eventBus'
-import { StreamRoles } from '@speckle/shared'
+import { EventBusListen, EventPayload } from '@/modules/shared/services/eventBus'
+
+// Activity
+
+const addProjectPermissionsAddedActivityFactory =
+  ({ saveActivity }: { saveActivity: SaveActivity }) =>
+  async ({
+    payload: { activityUserId, project, role, targetUserId, previousRole }
+  }: EventPayload<typeof ProjectEvents.PermissionsAdded>) => {
+    await saveActivity({
+      contextResourceId: project.id,
+      contextResourceType: 'project',
+      eventType: 'project_role_updated',
+      userId: activityUserId,
+      payload: {
+        version: '1',
+        userId: targetUserId,
+        new: role,
+        old: previousRole
+      }
+    })
+  }
+
+const addProjectPermissionsRevokedActivityFactory =
+  ({ saveActivity }: { saveActivity: SaveActivity }) =>
+  async ({
+    payload: { activityUserId, project, removedUserId, role }
+  }: EventPayload<typeof ProjectEvents.PermissionsRevoked>) => {
+    await saveActivity({
+      contextResourceId: project.id,
+      contextResourceType: 'project',
+      eventType: 'project_role_deleted',
+      userId: activityUserId,
+      payload: {
+        version: '1',
+        userId: removedUserId,
+        old: role
+      }
+    })
+  }
+
+// Stream activity
 
 /**
  * Save "user created stream" activity item
  */
 const addStreamCreatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
+  ({ saveStreamActivity }: { saveStreamActivity: SaveStreamActivity }) =>
   async (params: {
     streamId: string
     creatorId: string
@@ -29,7 +70,7 @@ const addStreamCreatedActivityFactory =
   }) => {
     const { streamId, creatorId, input } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Stream,
       resourceId: streamId,
@@ -44,11 +85,15 @@ const addStreamCreatedActivityFactory =
  * Save "stream updated" activity
  */
 const addStreamUpdatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddStreamUpdatedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddStreamUpdatedActivity =>
   async (params) => {
     const { streamId, updaterId, oldStream, update } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Stream,
       resourceId: streamId,
@@ -63,11 +108,15 @@ const addStreamUpdatedActivityFactory =
  * Save "stream deleted" activity
  */
 const addStreamDeletedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }): AddStreamDeletedActivity =>
+  ({
+    saveStreamActivity
+  }: {
+    saveStreamActivity: SaveStreamActivity
+  }): AddStreamDeletedActivity =>
   async (params) => {
     const { streamId, deleterId } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId,
       resourceType: StreamResourceTypes.Stream,
       resourceId: streamId,
@@ -82,7 +131,7 @@ const addStreamDeletedActivityFactory =
  * Save "user cloned stream X" activity item
  */
 const addStreamClonedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
+  ({ saveStreamActivity }: { saveStreamActivity: SaveStreamActivity }) =>
   async (params: {
     sourceStreamId: string
     newStream: StreamRecord
@@ -91,7 +140,7 @@ const addStreamClonedActivityFactory =
     const { sourceStreamId, newStream, clonerId } = params
     const newStreamId = newStream.id
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId: newStreamId,
       resourceType: StreamResourceTypes.Stream,
       resourceId: newStreamId,
@@ -102,68 +151,31 @@ const addStreamClonedActivityFactory =
     })
   }
 
-/**
- * Save "stream permissions granted to user" activity item
- */
-const addStreamPermissionsAddedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
-  async (params: {
-    streamId: string
-    activityUserId: string
-    targetUserId: string
-    role: StreamRoles
-  }) => {
-    const { streamId, activityUserId, targetUserId, role } = params
-    await saveActivity({
-      streamId,
-      resourceType: StreamResourceTypes.Stream,
-      resourceId: streamId,
-      actionType: StreamActionTypes.Stream.PermissionsAdd,
-      userId: activityUserId,
-      info: { targetUser: targetUserId, role },
-      message: `Permission granted to user ${targetUserId} (${role})`
-    })
-  }
-
-/**
- * Save "stream permissions revoked for user" activity item
- */
-const addStreamPermissionsRevokedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
-  async (params: {
-    streamId: string
-    activityUserId: string
-    removedUserId: string
-    stream: StreamRecord
-  }) => {
-    const { streamId, activityUserId, removedUserId } = params
-    const isVoluntaryLeave = activityUserId === removedUserId
-
-    await saveActivity({
-      streamId,
-      resourceType: StreamResourceTypes.Stream,
-      resourceId: streamId,
-      actionType: StreamActionTypes.Stream.PermissionsRemove,
-      userId: activityUserId,
-      info: { targetUser: removedUserId },
-      message: isVoluntaryLeave
-        ? `User ${removedUserId} left the stream`
-        : `Permission revoked for user ${removedUserId}`
-    })
-  }
-
 export const reportStreamActivityFactory =
-  (deps: { eventListen: EventBusListen; saveActivity: SaveStreamActivity }) => () => {
+  (deps: {
+    eventListen: EventBusListen
+    saveActivity: SaveActivity
+    saveStreamActivity: SaveStreamActivity
+  }) =>
+  () => {
+    const addProjectPermissionsAddedActivity =
+      addProjectPermissionsAddedActivityFactory(deps)
+    const addProjectPermissionsRevokedActivity =
+      addProjectPermissionsRevokedActivityFactory(deps)
     const addStreamCreatedActivity = addStreamCreatedActivityFactory(deps)
     const addStreamUpdatedActivity = addStreamUpdatedActivityFactory(deps)
     const addStreamDeletedActivity = addStreamDeletedActivityFactory(deps)
     const addStreamClonedActivity = addStreamClonedActivityFactory(deps)
-    const addStreamPermissionsAddedActivity =
-      addStreamPermissionsAddedActivityFactory(deps)
-    const addStreamPermissionsRevokedActivity =
-      addStreamPermissionsRevokedActivityFactory(deps)
 
     const quitters = [
+      deps.eventListen(
+        ProjectEvents.PermissionsAdded,
+        addProjectPermissionsAddedActivity
+      ),
+      deps.eventListen(
+        ProjectEvents.PermissionsRevoked,
+        addProjectPermissionsRevokedActivity
+      ),
       deps.eventListen(ProjectEvents.Created, async ({ payload }) => {
         await addStreamCreatedActivity({
           stream: payload.project,
@@ -194,22 +206,6 @@ export const reportStreamActivityFactory =
           newStream: payload.newProject,
           clonerId: payload.clonerId
         })
-      }),
-      deps.eventListen(ProjectEvents.PermissionsAdded, async ({ payload }) => {
-        await addStreamPermissionsAddedActivity({
-          streamId: payload.project.id,
-          activityUserId: payload.activityUserId,
-          targetUserId: payload.targetUserId,
-          role: payload.role
-        })
-      }),
-      deps.eventListen(ProjectEvents.PermissionsRevoked, async ({ payload }) => {
-        await addStreamPermissionsRevokedActivity({
-          streamId: payload.project.id,
-          activityUserId: payload.activityUserId,
-          removedUserId: payload.removedUserId,
-          stream: payload.project
-        })
       })
     ]
 
diff --git a/packages/server/modules/activitystream/events/userListeners.ts b/packages/server/modules/activitystream/events/userListeners.ts
index 3280ad3e3..e9f2ae6e7 100644
--- a/packages/server/modules/activitystream/events/userListeners.ts
+++ b/packages/server/modules/activitystream/events/userListeners.ts
@@ -9,11 +9,11 @@ import { EventBusListen, EventPayload } from '@/modules/shared/services/eventBus
 import { UserEvents } from '@/modules/core/domain/users/events'
 
 const addUserCreatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
+  ({ saveStreamActivity }: { saveStreamActivity: SaveStreamActivity }) =>
   async (payload: EventPayload<typeof UserEvents.Created>) => {
     const { user } = payload.payload
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId: null,
       resourceType: StreamResourceTypes.User,
       resourceId: user.id,
@@ -25,7 +25,7 @@ const addUserCreatedActivityFactory =
   }
 
 const addUserUpdatedActivityFactory =
-  ({ saveActivity }: { saveActivity: SaveStreamActivity }) =>
+  ({ saveStreamActivity }: { saveStreamActivity: SaveStreamActivity }) =>
   async (params: {
     oldUser: UserRecord
     update: UserUpdateInput
@@ -33,7 +33,7 @@ const addUserUpdatedActivityFactory =
   }) => {
     const { oldUser, update, updaterId } = params
 
-    await saveActivity({
+    await saveStreamActivity({
       streamId: null,
       resourceType: StreamResourceTypes.User,
       resourceId: oldUser.id,
@@ -45,11 +45,11 @@ const addUserUpdatedActivityFactory =
   }
 
 const addUserDeletedActivityFactory =
-  (deps: { saveActivity: SaveStreamActivity }) =>
+  (deps: { saveStreamActivity: SaveStreamActivity }) =>
   async (params: { targetUserId: string; invokerUserId: string }) => {
     const { targetUserId, invokerUserId } = params
 
-    await deps.saveActivity({
+    await deps.saveStreamActivity({
       streamId: null,
       resourceType: 'user',
       resourceId: targetUserId,
@@ -61,7 +61,8 @@ const addUserDeletedActivityFactory =
   }
 
 export const reportUserActivityFactory =
-  (deps: { eventListen: EventBusListen; saveActivity: SaveStreamActivity }) => () => {
+  (deps: { eventListen: EventBusListen; saveStreamActivity: SaveStreamActivity }) =>
+  () => {
     const addUserDeletedActivity = addUserDeletedActivityFactory(deps)
     const addUserUpdatedActivity = addUserUpdatedActivityFactory(deps)
     const addUserCreatedActivity = addUserCreatedActivityFactory(deps)
diff --git a/packages/server/modules/activitystream/helpers/types.ts b/packages/server/modules/activitystream/helpers/types.ts
index 6d8fa9944..a633e0fdd 100644
--- a/packages/server/modules/activitystream/helpers/types.ts
+++ b/packages/server/modules/activitystream/helpers/types.ts
@@ -1,18 +1,4 @@
 import { Nullable } from '@/modules/shared/helpers/typeHelper'
-import { ResourceEventsToPayloadMap } from '@/modules/activitystream/domain/types'
-
-export interface Activity<
-  T extends keyof ResourceEventsToPayloadMap,
-  R extends keyof ResourceEventsToPayloadMap[T]
-> {
-  id: string
-  contextResourceId: string
-  contextResourceType: T
-  eventType: R
-  userId: string | null
-  payload: ResourceEventsToPayloadMap[T][R]
-  createdAt: Date
-}
 
 export type StreamActivityRecord = {
   streamId: Nullable<string>
diff --git a/packages/server/modules/activitystream/index.ts b/packages/server/modules/activitystream/index.ts
index e36dba0b8..7b4ee02f4 100644
--- a/packages/server/modules/activitystream/index.ts
+++ b/packages/server/modules/activitystream/index.ts
@@ -44,45 +44,47 @@ const initializeEventListeners = ({
   eventBus: EventBus
   db: Knex
 }) => {
+  const saveActivity = saveActivityFactory({ db })
   const saveStreamActivity = saveStreamActivityFactory({ db })
   const reportUserActivity = reportUserActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveStreamActivity
+    saveStreamActivity
   })
   const reportAccessRequestActivity = reportAccessRequestActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveStreamActivity
+    saveStreamActivity
   })
   const reportBranchActivity = reportBranchActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveStreamActivity
+    saveStreamActivity
   })
   const reportCommitActivity = reportCommitActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveStreamActivity
+    saveStreamActivity
   })
   const reportCommentActivity = reportCommentActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveStreamActivity
+    saveStreamActivity
   })
   const reportStreamInviteActivity = reportStreamInviteActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveStreamActivity,
+    saveStreamActivity,
     getProjectInviteProject: getProjectInviteProjectFactory({
       getStream: getStreamFactory({ db })
     })
   })
   const reportStreamActivity = reportStreamActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveStreamActivity
+    saveActivity,
+    saveStreamActivity
   })
   const reportGatekeeperActivity = reportGatekeeperActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveActivityFactory({ db })
+    saveActivity
   })
   const reportWorkspaceActivity = reportWorkspaceActivityFactory({
     eventListen: eventBus.listen,
-    saveActivity: saveActivityFactory({ db })
+    saveActivity
   })
 
   const quitCbs = [
diff --git a/packages/server/modules/activitystream/repositories/index.ts b/packages/server/modules/activitystream/repositories/index.ts
index 68a8178ce..04c7cd7eb 100644
--- a/packages/server/modules/activitystream/repositories/index.ts
+++ b/packages/server/modules/activitystream/repositories/index.ts
@@ -1,5 +1,6 @@
 import {
   GetActiveUserStreams,
+  GetActivities,
   GetActivityCountByResourceId,
   GetActivityCountByStreamId,
   GetActivityCountByUserId,
@@ -15,7 +16,11 @@ import {
   StreamActivityRecord,
   StreamScopeActivity
 } from '@/modules/activitystream/helpers/types'
-import { Activity, StreamAcl, StreamActivity } from '@/modules/core/dbSchema'
+import {
+  Activity as ActivityModel,
+  StreamAcl,
+  StreamActivity
+} from '@/modules/core/dbSchema'
 import { Roles } from '@/modules/core/helpers/mainConstants'
 import { StreamAclRecord } from '@/modules/core/helpers/types'
 import {
@@ -29,6 +34,7 @@ import { getUserFactory } from '@/modules/core/repositories/users'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import { getProjectDbClient } from '@/modules/multiregion/utils/dbSelector'
 import cryptoRandomString from 'crypto-random-string'
+import { Activity } from '@/modules/activitystream/domain/types'
 
 const tables = {
   streamActivity: <T extends object = StreamActivityRecord>(db: Knex) =>
@@ -36,7 +42,7 @@ const tables = {
   streamAcl: (db: Knex) => db<StreamAclRecord>(StreamAcl.name)
 }
 
-export const getActivityFactory =
+export const geUserStreamActivityFactory =
   ({ db }: { db: Knex }) =>
   async (
     streamId: string,
@@ -280,8 +286,40 @@ export const saveActivityFactory =
     const createdAt = new Date()
 
     const [result] = await db<typeof activity & { id: string; createdAt: Date }>(
-      Activity.name
+      ActivityModel.name
     ).insert({ ...activity, id, createdAt }, '*')
 
     return result
   }
+
+export const getActivitiesFactory =
+  ({ db }: { db: Knex }): GetActivities =>
+  async (filters = {}): Promise<Activity[]> => {
+    const { workspaceId, projectId, eventType, userId } = filters
+
+    const q = db<Activity>(ActivityModel.name).select('*')
+
+    if (projectId) {
+      q.where(ActivityModel.col.contextResourceId, projectId).andWhere(
+        ActivityModel.col.contextResourceType,
+        'project'
+      )
+    }
+
+    if (workspaceId) {
+      q.where(ActivityModel.col.contextResourceId, workspaceId).andWhere(
+        ActivityModel.col.contextResourceType,
+        'workspace'
+      )
+    }
+
+    if (eventType) {
+      q.andWhere(ActivityModel.col.eventType, eventType)
+    }
+
+    if (userId) {
+      q.andWhere(ActivityModel.col.userId, userId)
+    }
+
+    return await q
+  }
diff --git a/packages/server/modules/activitystream/services/summary.ts b/packages/server/modules/activitystream/services/summary.ts
index ef777b10a..15d6270ca 100644
--- a/packages/server/modules/activitystream/services/summary.ts
+++ b/packages/server/modules/activitystream/services/summary.ts
@@ -5,7 +5,7 @@ import {
 import {
   CreateActivitySummary,
   GetActiveUserStreams,
-  GetActivity
+  GetUserStreamActivity
 } from '@/modules/activitystream/domain/operations'
 import { GetStream } from '@/modules/core/domain/streams/operations'
 import { GetUser } from '@/modules/core/domain/users/operations'
@@ -17,7 +17,7 @@ export const createActivitySummaryFactory =
     getUser
   }: {
     getStream: GetStream
-    getActivity: GetActivity
+    getActivity: GetUserStreamActivity
     getUser: GetUser
   }): CreateActivitySummary =>
   async ({
diff --git a/packages/server/modules/activitystream/tests/integration/activity.graph.spec.ts b/packages/server/modules/activitystream/tests/integration/activity.graph.spec.ts
index b79c3d238..1cf74a434 100644
--- a/packages/server/modules/activitystream/tests/integration/activity.graph.spec.ts
+++ b/packages/server/modules/activitystream/tests/integration/activity.graph.spec.ts
@@ -12,7 +12,10 @@ import {
   addOrUpdateStreamCollaboratorFactory
 } from '@/modules/core/services/streams/access'
 import { authorizeResolver } from '@/modules/shared'
-import { grantStreamPermissionsFactory } from '@/modules/core/repositories/streams'
+import {
+  getStreamRolesFactory,
+  grantStreamPermissionsFactory
+} from '@/modules/core/repositories/streams'
 import {
   getUserFactory,
   storeUserFactory,
@@ -49,6 +52,7 @@ import { getEventBus } from '@/modules/shared/services/eventBus'
 import type http from 'node:http'
 import { BasicTestStream, createTestStream } from '@/test/speckle-helpers/streamHelper'
 import { BasicTestBranch, createTestBranch } from '@/test/speckle-helpers/branchHelper'
+import { getActivitiesFactory } from '@/modules/activitystream/repositories/index'
 
 const getUser = getUserFactory({ db })
 const getUserActivity = getUserActivityFactory({ db })
@@ -57,6 +61,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -100,6 +105,8 @@ const createObject = createObjectFactory({
   storeSingleObjectIfNotFoundFactory: storeSingleObjectIfNotFoundFactory({ db })
 })
 
+const getActivities = getActivitiesFactory({ db })
+
 let server: http.Server
 let sendRequest: Awaited<ReturnType<typeof initializeTestServer>>['sendRequest']
 
@@ -265,11 +272,37 @@ describe('Activity @activity', () => {
     expect(activityC.length).to.equal(3)
     expect(activityC[0].actionType).to.equal('commit_create')
 
-    const { items: activityI } = await getUserActivity({ userId: userIz.id })
+    const activityI = await getUserActivity({ userId: userIz.id })
 
-    // iz1 to iz4 + user created + user added as collaborator
-    expect(activityI.length).to.equal(6)
-    expect(activityI[0].actionType).to.equal('stream_permissions_add')
+    expect(activityI.items.length).to.equal(4)
+    expect(activityI).to.nested.include({
+      'items[0].actionType': 'commit_create',
+      'items[1].actionType': 'branch_create',
+      'items[2].actionType': 'stream_create',
+      'items[3].actionType': 'user_create'
+    })
+
+    const activity = { items: await getActivities({ userId: userIz.id }) }
+
+    expect(activity.items.length).to.equal(3)
+    expect(activity).to.nested.include({
+      'items[0].eventType': 'project_role_updated',
+      'items[0].payload.new': 'stream:owner',
+      'items[0].payload.old': null,
+      'items[0].userId': userIz.id, // created branch
+
+      'items[1].eventType': 'project_role_updated',
+      'items[1].payload.new': 'stream:reviewer',
+      'items[1].payload.old': null,
+      'items[1].payload.userId': userCr.id,
+      'items[1].userId': userIz.id, // added user
+
+      'items[2].eventType': 'project_role_updated',
+      'items[2].payload.new': 'stream:contributor',
+      'items[2].payload.old': 'stream:reviewer',
+      'items[2].payload.userId': userCr.id,
+      'items[2].userId': userIz.id // made him a contibutor
+    })
   })
 
   after(async () => {
@@ -283,9 +316,9 @@ describe('Activity @activity', () => {
     expect(noErrors(res))
     const activity = res.body.data.activeUser.activity
 
-    expect(activity.items.length).to.equal(6)
-    expect(activity.totalCount).to.equal(6)
-    expect(activity.items[0].actionType).to.equal('stream_permissions_add')
+    expect(activity.items.length).to.equal(4)
+    expect(activity.totalCount).to.equal(4)
+    expect(activity.items[0].actionType).to.equal('commit_create')
     expect(activity.items[activity.totalCount - 1].actionType).to.equal('user_create')
   })
 
@@ -303,8 +336,8 @@ describe('Activity @activity', () => {
       query: `query {otherUser(id:"${userCr.id}") { name timeline { totalCount items {id streamId resourceType resourceId actionType userId message time}}} }`
     })
     expect(noErrors(res))
-    expect(res.body.data.otherUser.timeline.items.length).to.equal(7) // sum of all actions in before hook
-    expect(res.body.data.otherUser.timeline.totalCount).to.equal(7)
+    expect(res.body.data.otherUser.timeline.items.length).to.equal(5) // sum of all actions in before hook
+    expect(res.body.data.otherUser.timeline.totalCount).to.equal(5)
   })
 
   it("Should get a stream's activity", async () => {
@@ -313,8 +346,8 @@ describe('Activity @activity', () => {
     })
     expect(noErrors(res))
     const activity = res.body.data.stream.activity
-    expect(activity.items.length).to.equal(5)
-    expect(activity.totalCount).to.equal(5)
+    expect(activity.items.length).to.equal(3)
+    expect(activity.totalCount).to.equal(3)
     expect(activity.items[activity.totalCount - 1].actionType).to.equal('stream_create')
   })
 
diff --git a/packages/server/modules/activitystream/tests/integration/activitySummary.spec.ts b/packages/server/modules/activitystream/tests/integration/activitySummary.spec.ts
index 617beb5e2..c9ca40ae9 100644
--- a/packages/server/modules/activitystream/tests/integration/activitySummary.spec.ts
+++ b/packages/server/modules/activitystream/tests/integration/activitySummary.spec.ts
@@ -16,7 +16,7 @@ import {
   NotificationTypeMessageMap
 } from '@/modules/notifications/helpers/types'
 import {
-  getActivityFactory,
+  geUserStreamActivityFactory,
   saveStreamActivityFactory
 } from '@/modules/activitystream/repositories'
 import { db } from '@/db/knex'
@@ -24,6 +24,7 @@ import {
   createStreamFactory,
   deleteStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import {
@@ -81,7 +82,7 @@ const getStream = getStreamFactory({ db })
 const saveActivity = saveStreamActivityFactory({ db })
 const createActivitySummary = createActivitySummaryFactory({
   getStream,
-  getActivity: getActivityFactory({ db }),
+  getActivity: geUserStreamActivityFactory({ db }),
   getUser
 })
 
@@ -97,6 +98,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/auth/tests/auth.spec.ts b/packages/server/modules/auth/tests/auth.spec.ts
index 996480ad2..9c9553a72 100644
--- a/packages/server/modules/auth/tests/auth.spec.ts
+++ b/packages/server/modules/auth/tests/auth.spec.ts
@@ -22,7 +22,8 @@ import { collectAndValidateCoreTargetsFactory } from '@/modules/serverinvites/se
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { buildCoreInviteEmailContentsFactory } from '@/modules/serverinvites/services/coreEmailContents'
 import { getEventBus } from '@/modules/shared/services/eventBus'
@@ -95,6 +96,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/automate/tests/automations.spec.ts b/packages/server/modules/automate/tests/automations.spec.ts
index 34537636a..6dd4e364d 100644
--- a/packages/server/modules/automate/tests/automations.spec.ts
+++ b/packages/server/modules/automate/tests/automations.spec.ts
@@ -48,7 +48,10 @@ import {
   validateStreamAccessFactory
 } from '@/modules/core/services/streams/access'
 import { authorizeResolver } from '@/modules/shared'
-import { grantStreamPermissionsFactory } from '@/modules/core/repositories/streams'
+import {
+  getStreamRolesFactory,
+  grantStreamPermissionsFactory
+} from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { AutomationEvents } from '@/modules/automate/domain/events'
@@ -67,6 +70,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
diff --git a/packages/server/modules/blobstorage/tests/e2e/blobstorage.graph.spec.ts b/packages/server/modules/blobstorage/tests/e2e/blobstorage.graph.spec.ts
index 8e427a877..18bb10ff1 100644
--- a/packages/server/modules/blobstorage/tests/e2e/blobstorage.graph.spec.ts
+++ b/packages/server/modules/blobstorage/tests/e2e/blobstorage.graph.spec.ts
@@ -12,7 +12,8 @@ import {
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
 import {
@@ -83,6 +84,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/comments/tests/comments.spec.ts b/packages/server/modules/comments/tests/comments.spec.ts
index db41f952a..65724960a 100644
--- a/packages/server/modules/comments/tests/comments.spec.ts
+++ b/packages/server/modules/comments/tests/comments.spec.ts
@@ -56,7 +56,8 @@ import {
   getStreamFactory,
   createStreamFactory,
   markCommitStreamUpdatedFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import {
   createCommitByBranchIdFactory,
@@ -250,6 +251,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/core/domain/projects/events.ts b/packages/server/modules/core/domain/projects/events.ts
index c63337782..64432806c 100644
--- a/packages/server/modules/core/domain/projects/events.ts
+++ b/packages/server/modules/core/domain/projects/events.ts
@@ -6,7 +6,7 @@ import {
   StreamUpdateInput
 } from '@/modules/core/graph/generated/graphql'
 import { ServerInviteRecord } from '@/modules/serverinvites/domain/types'
-import { StreamRoles } from '@speckle/shared'
+import { Nullable, StreamRoles } from '@speckle/shared'
 
 export const projectEventsNamespace = 'projects' as const
 
@@ -54,10 +54,12 @@ export type ProjectEventsPayloads = {
     targetUserId: string
     role: StreamRoles
     project: Project
+    previousRole: Nullable<StreamRoles>
   }
   [ProjectEvents.PermissionsRevoked]: {
     activityUserId: string
     removedUserId: string
     project: Project
+    role: StreamRoles
   }
 }
diff --git a/packages/server/modules/core/domain/projects/operations.ts b/packages/server/modules/core/domain/projects/operations.ts
index 7ffe171ab..04bef00cb 100644
--- a/packages/server/modules/core/domain/projects/operations.ts
+++ b/packages/server/modules/core/domain/projects/operations.ts
@@ -1,4 +1,4 @@
-import { Project } from '@/modules/core/domain/streams/types'
+import { Project, StreamWithOptionalRole } from '@/modules/core/domain/streams/types'
 import { StreamAclRecord, StreamRecord } from '@/modules/core/helpers/types'
 import { MaybeNullOrUndefined, StreamRoles } from '@speckle/shared'
 
@@ -38,7 +38,7 @@ export type DeleteProjectRole = (args: {
 
 export type DeleteProject = (args: { projectId: string }) => Promise<void>
 
-export type GetRolesByUserId = ({
+export type GetUserProjectRoles = ({
   userId,
   workspaceId
 }: {
@@ -73,3 +73,15 @@ export type WaitForRegionProject = (params: {
   regionKey: string
   maxAttempts?: number
 }) => Promise<void>
+
+export type QueryAllProjects = (
+  args:
+    | {
+        userId: string
+        workspaceId?: string
+      }
+    | {
+        userId?: string
+        workspaceId: string
+      }
+) => AsyncGenerator<StreamWithOptionalRole[], void, unknown>
diff --git a/packages/server/modules/core/domain/streams/operations.ts b/packages/server/modules/core/domain/streams/operations.ts
index 96259e843..e11205f83 100644
--- a/packages/server/modules/core/domain/streams/operations.ts
+++ b/packages/server/modules/core/domain/streams/operations.ts
@@ -258,7 +258,7 @@ export type GetStreamRoles = (
   userId: string,
   streamIds: string[]
 ) => Promise<{
-  [streamId: string]: Nullable<string>
+  [streamId: string]: Nullable<StreamRoles>
 }>
 
 export type GetUserStreamCounts = (params: {
diff --git a/packages/server/modules/core/errors/projects.ts b/packages/server/modules/core/errors/projects.ts
index 650bcba88..c7b6d553b 100644
--- a/packages/server/modules/core/errors/projects.ts
+++ b/packages/server/modules/core/errors/projects.ts
@@ -11,3 +11,9 @@ export class ProjectNotFoundError extends BaseError {
   static code = 'PROJECT_NOT_FOUND'
   static statusCode = 404
 }
+
+export class ProjectQueryError extends BaseError {
+  static defaultMessage = 'Unexpected error during query operation'
+  static code = 'PROJECT_QUERY_ERROR'
+  static statusCode = 500
+}
diff --git a/packages/server/modules/core/graph/resolvers/projects.ts b/packages/server/modules/core/graph/resolvers/projects.ts
index e7e20f1e2..fcfe32a90 100644
--- a/packages/server/modules/core/graph/resolvers/projects.ts
+++ b/packages/server/modules/core/graph/resolvers/projects.ts
@@ -45,7 +45,8 @@ import {
   grantStreamPermissionsFactory,
   getOnboardingBaseStreamFactory,
   getUserStreamsPageFactory,
-  getUserStreamsCountFactory
+  getUserStreamsCountFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/users'
 import {
@@ -136,6 +137,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
@@ -203,6 +205,7 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 const updateStreamRoleAndNotify = updateStreamRoleAndNotifyFactory({
@@ -211,6 +214,7 @@ const updateStreamRoleAndNotify = updateStreamRoleAndNotifyFactory({
     validateStreamAccess,
     getUser,
     grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+    getStreamRoles: getStreamRolesFactory({ db }),
     emitEvent: getEventBus().emit
   }),
   removeStreamCollaborator
diff --git a/packages/server/modules/core/graph/resolvers/streams.ts b/packages/server/modules/core/graph/resolvers/streams.ts
index 5b25a0c1c..ffea6d6d4 100644
--- a/packages/server/modules/core/graph/resolvers/streams.ts
+++ b/packages/server/modules/core/graph/resolvers/streams.ts
@@ -25,7 +25,8 @@ import {
   canUserFavoriteStreamFactory,
   setStreamFavoritedFactory,
   getUserStreamsPageFactory,
-  getUserStreamsCountFactory
+  getUserStreamsCountFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import {
   createStreamReturnRecordFactory,
@@ -125,6 +126,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
@@ -203,6 +205,7 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 const updateStreamRoleAndNotify = updateStreamRoleAndNotifyFactory({
@@ -211,6 +214,7 @@ const updateStreamRoleAndNotify = updateStreamRoleAndNotifyFactory({
     validateStreamAccess,
     getUser,
     grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+    getStreamRoles: getStreamRolesFactory({ db }),
     emitEvent: getEventBus().emit
   }),
   removeStreamCollaborator
diff --git a/packages/server/modules/core/graph/resolvers/users.ts b/packages/server/modules/core/graph/resolvers/users.ts
index b5edeafc3..3cb62b243 100644
--- a/packages/server/modules/core/graph/resolvers/users.ts
+++ b/packages/server/modules/core/graph/resolvers/users.ts
@@ -33,7 +33,8 @@ import {
 } from '@/modules/core/services/users/management'
 import {
   deleteStreamFactory,
-  getUserDeletableStreamsFactory
+  getUserDeletableStreamsFactory,
+  legacyGetStreamsFactory
 } from '@/modules/core/repositories/streams'
 import { dbLogger } from '@/observability/logging'
 import { getAdminUsersListCollectionFactory } from '@/modules/core/services/users/legacyAdminUsersList'
@@ -51,6 +52,8 @@ import { asOperation } from '@/modules/shared/command'
 import { setUserOnboardingChoicesFactory } from '@/modules/core/services/users/tracking'
 import { getMixpanelClient } from '@/modules/shared/utils/mixpanel'
 import { throwIfAuthNotOk } from '@/modules/shared/helpers/errorHelper'
+import { getUserWorkspaceSeatsFactory } from '@/modules/workspacesCore/repositories/workspaces'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const getUser = legacyGetUserFactory({ db })
 const getUserByEmail = legacyGetUserByEmailFactory({ db })
@@ -67,6 +70,10 @@ const deleteUser = deleteUserFactory({
   logger: dbLogger,
   isLastAdminUser: isLastAdminUserFactory({ db }),
   getUserDeletableStreams: getUserDeletableStreamsFactory({ db }),
+  queryAllProjects: queryAllProjectsFactory({
+    getStreams: legacyGetStreamsFactory({ db })
+  }),
+  getUserWorkspaceSeats: getUserWorkspaceSeatsFactory({ db }),
   deleteAllUserInvites: deleteAllUserInvitesFactory({ db }),
   deleteUserRecord: deleteUserRecordFactory({ db }),
   emitEvent: getEventBus().emit
diff --git a/packages/server/modules/core/repositories/projects.ts b/packages/server/modules/core/repositories/projects.ts
index 806895ef1..11638414d 100644
--- a/packages/server/modules/core/repositories/projects.ts
+++ b/packages/server/modules/core/repositories/projects.ts
@@ -2,6 +2,7 @@ import { StreamAcl, Streams } from '@/modules/core/dbSchema'
 import {
   DeleteProject,
   GetProject,
+  GetUserProjectRoles,
   StoreProject,
   StoreProjectRole,
   StoreProjectRoles
@@ -51,3 +52,17 @@ export const storeProjectRolesFactory =
       }))
     )
   }
+
+export const getUserProjectRolesFactory =
+  ({ db }: { db: Knex }): GetUserProjectRoles =>
+  async ({ userId, workspaceId }) => {
+    const query = db<StreamAclRecord>(StreamAcl.name).where({ userId })
+
+    if (workspaceId) {
+      query
+        .join(Streams.name, Streams.col.id, StreamAcl.col.resourceId)
+        .where({ workspaceId })
+    }
+
+    return await query
+  }
diff --git a/packages/server/modules/core/repositories/streams.ts b/packages/server/modules/core/repositories/streams.ts
index 25b9b8791..ec9a12f95 100644
--- a/packages/server/modules/core/repositories/streams.ts
+++ b/packages/server/modules/core/repositories/streams.ts
@@ -63,7 +63,6 @@ import { removePrivateFields } from '@/modules/core/helpers/userHelper'
 import {
   DeleteProjectRole,
   UpdateProject,
-  GetRolesByUserId,
   UpsertProjectRole
 } from '@/modules/core/domain/projects/operations'
 import {
@@ -455,7 +454,7 @@ export const getStreamRolesFactory =
   async (userId: string, streamIds: string[]) => {
     const q = tables
       .streams(deps.db)
-      .select<{ id: string; role: Nullable<string> }[]>([
+      .select<{ id: string; role: Nullable<StreamRoles> }[]>([
         Streams.col.id,
         StreamAcl.col.role
       ])
@@ -1330,20 +1329,6 @@ export const getOnboardingBaseStreamFactory =
     return await q
   }
 
-export const getRolesByUserIdFactory =
-  ({ db }: { db: Knex }): GetRolesByUserId =>
-  async ({ userId, workspaceId }) => {
-    const query = db<Pick<StreamAclRecord, 'role' | 'resourceId' | 'userId'>>(
-      StreamAcl.name
-    ).where({ userId })
-    if (workspaceId) {
-      query
-        .join(Streams.name, Streams.col.id, StreamAcl.col.resourceId)
-        .where({ workspaceId })
-    }
-    return await query
-  }
-
 /**
  * @deprecated Use getStreams() from the repository directly
  */
diff --git a/packages/server/modules/core/services/projects.ts b/packages/server/modules/core/services/projects.ts
index 705d10039..452901838 100644
--- a/packages/server/modules/core/services/projects.ts
+++ b/packages/server/modules/core/services/projects.ts
@@ -4,13 +4,17 @@ import {
   CreateProject,
   DeleteProject,
   GetProject,
+  QueryAllProjects,
   StoreModel,
   StoreProject,
   StoreProjectRole,
   WaitForRegionProject
 } from '@/modules/core/domain/projects/operations'
-import { Project } from '@/modules/core/domain/streams/types'
-import { RegionalProjectCreationError } from '@/modules/core/errors/projects'
+import { Project, StreamWithOptionalRole } from '@/modules/core/domain/streams/types'
+import {
+  ProjectQueryError,
+  RegionalProjectCreationError
+} from '@/modules/core/errors/projects'
 import { StreamNotFoundError } from '@/modules/core/errors/stream'
 import { ProjectVisibility } from '@/modules/core/graph/generated/graphql'
 import { mapGqlToDbProjectVisibility } from '@/modules/core/helpers/project'
@@ -19,6 +23,7 @@ import { EventBusEmit } from '@/modules/shared/services/eventBus'
 import { retry } from '@lifeomic/attempt'
 import { Roles, TIME_MS } from '@speckle/shared'
 import cryptoRandomString from 'crypto-random-string'
+import { LegacyGetStreams } from '@/modules/core/domain/streams/operations'
 
 export const createNewProjectFactory =
   ({
@@ -68,6 +73,7 @@ export const createNewProjectFactory =
       projectId,
       authorId: ownerId
     })
+
     await emitEvent({
       eventName: ProjectEvents.Created,
       payload: {
@@ -80,6 +86,17 @@ export const createNewProjectFactory =
         }
       }
     })
+
+    await emitEvent({
+      eventName: ProjectEvents.PermissionsAdded,
+      payload: {
+        project,
+        activityUserId: ownerId,
+        targetUserId: ownerId,
+        role: Roles.Stream.Owner,
+        previousRole: null
+      }
+    })
     return project
   }
 
@@ -109,3 +126,38 @@ export const waitForRegionProjectFactory =
       throw err
     }
   }
+
+export const queryAllProjectsFactory = ({
+  getStreams
+}: {
+  getStreams: LegacyGetStreams
+}): QueryAllProjects =>
+  async function* queryAllWorkspaceProjects({
+    userId,
+    workspaceId
+  }): AsyncGenerator<StreamWithOptionalRole[], void, unknown> {
+    let cursor: Date | null = null
+    let iterationCount = 0
+
+    if (!userId && !workspaceId) throw new ProjectQueryError()
+
+    do {
+      if (iterationCount > 500) throw new ProjectQueryError()
+
+      const { streams, cursorDate } = await getStreams({
+        cursor,
+        orderBy: null,
+        limit: 100,
+        visibility: null,
+        searchQuery: null,
+        streamIdWhitelist: null,
+        workspaceIdWhitelist: workspaceId ? [workspaceId] : null,
+        userId
+      })
+
+      yield streams
+
+      cursor = cursorDate
+      iterationCount++
+    } while (!!cursor)
+  }
diff --git a/packages/server/modules/core/services/streams/access.ts b/packages/server/modules/core/services/streams/access.ts
index 4016115f3..3ba243df6 100644
--- a/packages/server/modules/core/services/streams/access.ts
+++ b/packages/server/modules/core/services/streams/access.ts
@@ -2,6 +2,7 @@ import { ProjectEvents } from '@/modules/core/domain/projects/events'
 import {
   AddOrUpdateStreamCollaborator,
   GetStream,
+  GetStreamRoles,
   GrantStreamPermissions,
   IsStreamCollaborator,
   RemoveStreamCollaborator,
@@ -92,6 +93,7 @@ export const removeStreamCollaboratorFactory =
     validateStreamAccess: ValidateStreamAccess
     isStreamCollaborator: IsStreamCollaborator
     revokeStreamPermissions: RevokeStreamPermissions
+    getStreamRoles: GetStreamRoles
     emitEvent: EventBusEmit
   }): RemoveStreamCollaborator =>
   async (streamId, userId, removedById, removerResourceAccessRules, options) => {
@@ -113,19 +115,23 @@ export const removeStreamCollaboratorFactory =
       }
     }
 
+    const { [streamId]: role } = await deps.getStreamRoles(userId, [streamId])
     const stream = await deps.revokeStreamPermissions({ streamId, userId }, options)
     if (!stream) {
       throw new LogicError('Stream not found')
     }
 
-    await deps.emitEvent({
-      eventName: ProjectEvents.PermissionsRevoked,
-      payload: {
-        project: stream,
-        activityUserId: removedById,
-        removedUserId: userId
-      }
-    })
+    if (role) {
+      await deps.emitEvent({
+        eventName: ProjectEvents.PermissionsRevoked,
+        payload: {
+          project: stream,
+          activityUserId: removedById,
+          removedUserId: userId,
+          role
+        }
+      })
+    }
 
     return stream
   }
@@ -145,6 +151,7 @@ export const addOrUpdateStreamCollaboratorFactory =
     validateStreamAccess: ValidateStreamAccess
     getUser: GetUser
     grantStreamPermissions: GrantStreamPermissions
+    getStreamRoles: GetStreamRoles
     emitEvent: EventBusEmit
   }): AddOrUpdateStreamCollaborator =>
   async (
@@ -194,6 +201,7 @@ export const addOrUpdateStreamCollaboratorFactory =
       }
     })
 
+    const { [streamId]: previousRole } = await deps.getStreamRoles(userId, [streamId])
     const stream = (await deps.grantStreamPermissions(
       {
         streamId,
@@ -203,17 +211,16 @@ export const addOrUpdateStreamCollaboratorFactory =
       { trackProjectUpdate }
     )) as StreamRecord // validateStreamAccess already checked that it exists
 
-    if (!fromInvite) {
-      await deps.emitEvent({
-        eventName: ProjectEvents.PermissionsAdded,
-        payload: {
-          project: stream,
-          activityUserId: addedById,
-          targetUserId: userId,
-          role: role as StreamRoles
-        }
-      })
-    }
+    await deps.emitEvent({
+      eventName: ProjectEvents.PermissionsAdded,
+      payload: {
+        project: stream,
+        activityUserId: addedById,
+        targetUserId: userId,
+        role: role as StreamRoles,
+        previousRole: previousRole || null
+      }
+    })
 
     return stream
   }
diff --git a/packages/server/modules/core/services/streams/management.ts b/packages/server/modules/core/services/streams/management.ts
index 7976fdd74..934cf1ea5 100644
--- a/packages/server/modules/core/services/streams/management.ts
+++ b/packages/server/modules/core/services/streams/management.ts
@@ -92,6 +92,17 @@ export const createStreamReturnRecordFactory =
       }
     })
 
+    await deps.emitEvent({
+      eventName: ProjectEvents.PermissionsAdded,
+      payload: {
+        project: stream,
+        activityUserId: ownerId,
+        targetUserId: ownerId,
+        role: Roles.Stream.Owner,
+        previousRole: null
+      }
+    })
+
     return stream
   }
 
diff --git a/packages/server/modules/core/services/users/management.ts b/packages/server/modules/core/services/users/management.ts
index cec384848..ba217ea18 100644
--- a/packages/server/modules/core/services/users/management.ts
+++ b/packages/server/modules/core/services/users/management.ts
@@ -54,6 +54,11 @@ import { GetServerInfo } from '@/modules/core/domain/server/operations'
 import { EventBusEmit } from '@/modules/shared/services/eventBus'
 import { UserEvents } from '@/modules/core/domain/users/events'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
+import { GetUserWorkspaceSeatsFactory } from '@/modules/workspacesCore/domain/operations'
+import { WorkspaceEvents } from '@/modules/workspacesCore/domain/events'
+import { ProjectEvents } from '@/modules/core/domain/projects/events'
+import { QueryAllProjects } from '@/modules/core/domain/projects/operations'
+import { StreamWithOptionalRole } from '@/modules/core/repositories/streams'
 
 const { FF_NO_PERSONAL_EMAILS_ENABLED } = getFeatureFlags()
 
@@ -288,7 +293,9 @@ export const deleteUserFactory =
     isLastAdminUser: IsLastAdminUser
     getUserDeletableStreams: GetUserDeletableStreams
     deleteAllUserInvites: DeleteAllUserInvites
+    getUserWorkspaceSeats: GetUserWorkspaceSeatsFactory
     deleteUserRecord: DeleteUserRecord
+    queryAllProjects: QueryAllProjects
     emitEvent: EventBusEmit
   }): DeleteUser =>
   async (id, invokerId) => {
@@ -307,6 +314,39 @@ export const deleteUserFactory =
     // THIS REALLY SHOULD BE A REACTION TO THE USER DELETED EVENT EMITTED HER
     await deps.deleteAllUserInvites(id)
 
+    const workspaceSeats = await deps.getUserWorkspaceSeats({ userId: id })
+    for (const seat of workspaceSeats) {
+      await deps.emitEvent({
+        eventName: WorkspaceEvents.SeatDeleted,
+        payload: {
+          updatedByUserId: id,
+          previousSeat: seat
+        }
+      })
+    }
+
+    const emitRevokeEventIfUserHasRole = async (project: StreamWithOptionalRole) => {
+      if (!project.role) return
+
+      await deps.emitEvent({
+        eventName: ProjectEvents.PermissionsRevoked,
+        payload: {
+          activityUserId: id,
+          removedUserId: id,
+          role: project.role,
+          project
+        }
+      })
+    }
+
+    for await (const projectsPage of deps.queryAllProjects({
+      userId: id
+    })) {
+      for (const project of projectsPage) {
+        await emitRevokeEventIfUserHasRole(project)
+      }
+    }
+
     const deleted = await deps.deleteUserRecord(id)
     if (deleted) {
       await deps.emitEvent({
diff --git a/packages/server/modules/core/tests/batchCommits.spec.ts b/packages/server/modules/core/tests/batchCommits.spec.ts
index 5c64b2ed4..1f70735b0 100644
--- a/packages/server/modules/core/tests/batchCommits.spec.ts
+++ b/packages/server/modules/core/tests/batchCommits.spec.ts
@@ -4,7 +4,10 @@ import { Commits, Streams, Users } from '@/modules/core/dbSchema'
 import { Roles } from '@/modules/core/helpers/mainConstants'
 import { createBranchFactory } from '@/modules/core/repositories/branches'
 import { getCommitsFactory } from '@/modules/core/repositories/commits'
-import { grantStreamPermissionsFactory } from '@/modules/core/repositories/streams'
+import {
+  getStreamRolesFactory,
+  grantStreamPermissionsFactory
+} from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import {
   addOrUpdateStreamCollaboratorFactory,
@@ -39,6 +42,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
diff --git a/packages/server/modules/core/tests/branches.spec.ts b/packages/server/modules/core/tests/branches.spec.ts
index f8d130081..d01a9f756 100644
--- a/packages/server/modules/core/tests/branches.spec.ts
+++ b/packages/server/modules/core/tests/branches.spec.ts
@@ -28,7 +28,8 @@ import {
   createStreamFactory,
   markBranchStreamUpdatedFactory,
   markCommitStreamUpdatedFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import {
   createCommitByBranchIdFactory,
@@ -152,6 +153,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/core/tests/commits.spec.ts b/packages/server/modules/core/tests/commits.spec.ts
index 6b43f358b..0a49084c9 100644
--- a/packages/server/modules/core/tests/commits.spec.ts
+++ b/packages/server/modules/core/tests/commits.spec.ts
@@ -38,7 +38,8 @@ import {
   getCommitStreamFactory,
   createStreamFactory,
   markCommitStreamUpdatedFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import {
   getObjectFactory,
@@ -166,6 +167,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/core/tests/commitsGraphql.spec.ts b/packages/server/modules/core/tests/commitsGraphql.spec.ts
index e3b104e86..28f3f0cdc 100644
--- a/packages/server/modules/core/tests/commitsGraphql.spec.ts
+++ b/packages/server/modules/core/tests/commitsGraphql.spec.ts
@@ -2,7 +2,10 @@ import { buildApolloServer } from '@/app'
 import { db } from '@/db/knex'
 import { Commits, Streams, Users } from '@/modules/core/dbSchema'
 import { Roles } from '@/modules/core/helpers/mainConstants'
-import { grantStreamPermissionsFactory } from '@/modules/core/repositories/streams'
+import {
+  getStreamRolesFactory,
+  grantStreamPermissionsFactory
+} from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import {
   addOrUpdateStreamCollaboratorFactory,
@@ -25,6 +28,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
diff --git a/packages/server/modules/core/tests/favoriteStreams.spec.ts b/packages/server/modules/core/tests/favoriteStreams.spec.ts
index f3e282692..d3597b69b 100644
--- a/packages/server/modules/core/tests/favoriteStreams.spec.ts
+++ b/packages/server/modules/core/tests/favoriteStreams.spec.ts
@@ -15,7 +15,8 @@ import {
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
 import {
@@ -86,6 +87,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/core/tests/generic.spec.ts b/packages/server/modules/core/tests/generic.spec.ts
index 02fba6e32..4f9574bbc 100644
--- a/packages/server/modules/core/tests/generic.spec.ts
+++ b/packages/server/modules/core/tests/generic.spec.ts
@@ -11,7 +11,8 @@ import { ForbiddenError } from '@/modules/shared/errors'
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
 import {
@@ -78,6 +79,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/core/tests/graph.spec.ts b/packages/server/modules/core/tests/graph.spec.ts
index 70d6719da..7481e8b5c 100644
--- a/packages/server/modules/core/tests/graph.spec.ts
+++ b/packages/server/modules/core/tests/graph.spec.ts
@@ -18,7 +18,8 @@ import { authorizeResolver } from '@/modules/shared'
 import {
   getStreamFactory,
   revokeStreamPermissionsFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import {
   getUserFactory,
@@ -76,6 +77,7 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -83,6 +85,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 const getUsers = legacyGetPaginatedUsersFactory({ db })
diff --git a/packages/server/modules/core/tests/integration/projectRepositories.spec.ts b/packages/server/modules/core/tests/integration/projectRepositories.spec.ts
index 4c2467ec0..6eb541f22 100644
--- a/packages/server/modules/core/tests/integration/projectRepositories.spec.ts
+++ b/packages/server/modules/core/tests/integration/projectRepositories.spec.ts
@@ -7,7 +7,7 @@ import {
   storeProjectFactory,
   storeProjectRoleFactory
 } from '@/modules/core/repositories/projects'
-import { getRolesByUserIdFactory } from '@/modules/core/repositories/streams'
+import { getUserProjectRolesFactory } from '@/modules/core/repositories/projects'
 import { expectToThrow } from '@/test/assertionHelper'
 import { createTestUser } from '@/test/authHelper'
 import { Roles } from '@speckle/shared'
@@ -105,7 +105,9 @@ describe('project repositories @core', () => {
         userId: testUser.id
       }
       await storeProjectRole(role)
-      const storedRoles = await getRolesByUserIdFactory({ db })({ userId: testUser.id })
+      const storedRoles = await getUserProjectRolesFactory({ db })({
+        userId: testUser.id
+      })
       expect(storedRoles).deep.equalInAnyOrder([
         { resourceId: project.id, role: role.role, userId: role.userId }
       ])
diff --git a/packages/server/modules/core/tests/integration/subs.graph.spec.ts b/packages/server/modules/core/tests/integration/subs.graph.spec.ts
index f9cac82c8..ab76a035c 100644
--- a/packages/server/modules/core/tests/integration/subs.graph.spec.ts
+++ b/packages/server/modules/core/tests/integration/subs.graph.spec.ts
@@ -20,6 +20,7 @@ import {
   deleteStreamFactory,
   getCommitStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   getStreamsFactory,
   grantStreamPermissionsFactory,
   markBranchStreamUpdatedFactory,
@@ -188,6 +189,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser: getUserFactory({ db }),
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -195,6 +197,7 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -216,125 +219,123 @@ describe('Core GraphQL Subscriptions (New)', () => {
     subServer.quit()
   })
 
-  const modes = [
-    { isMultiRegion: false },
-    ...(isMultiRegionTestMode() ? [{ isMultiRegion: true }] : [])
-  ]
+  const isMultiRegion = isMultiRegionTestMode()
 
-  modes.forEach(({ isMultiRegion }) => {
-    describe(`W/${!isMultiRegion ? 'o' : ''} @multiregion`, () => {
-      const myMainWorkspace: BasicTestWorkspace = {
-        id: '',
-        ownerId: '',
-        slug: '',
-        name: 'My Main Workspace'
-      }
-      const otherGuysWorkspace: BasicTestWorkspace = {
-        id: '',
-        ownerId: '',
-        slug: '',
-        name: 'Other Guys Workspace'
-      }
+  describe(`W/${!isMultiRegion ? 'o' : ''} @multiregion`, () => {
+    const myMainWorkspace: BasicTestWorkspace = {
+      id: '',
+      ownerId: '',
+      slug: '',
+      name: 'My Main Workspace'
+    }
+    const otherGuysWorkspace: BasicTestWorkspace = {
+      id: '',
+      ownerId: '',
+      slug: '',
+      name: 'Other Guys Workspace'
+    }
 
-      before(async () => {
-        await Promise.all([
-          createTestWorkspace(myMainWorkspace, me, {
-            regionKey: isMultiRegion ? getMainTestRegionKey() : undefined,
-            addPlan: WorkspacePlans.Pro
-          }),
-          createTestWorkspace(otherGuysWorkspace, otherGuy, {
-            regionKey: isMultiRegion ? getMainTestRegionKey() : undefined,
-            addPlan: WorkspacePlans.Pro
-          })
-        ])
+    before(async () => {
+      await Promise.all([
+        createTestWorkspace(myMainWorkspace, me, {
+          regionKey: isMultiRegion ? getMainTestRegionKey() : undefined,
+          addPlan: WorkspacePlans.Pro
+        }),
+        createTestWorkspace(otherGuysWorkspace, otherGuy, {
+          regionKey: isMultiRegion ? getMainTestRegionKey() : undefined,
+          addPlan: WorkspacePlans.Pro
+        })
+      ])
 
-        await waitForRegionUsers([me, otherGuy])
-      })
+      await waitForRegionUsers([me, otherGuy])
+    })
 
-      describe('Project Subs', () => {
-        describe('scope tests', () => {
-          const randomProject: BasicTestStream = {
-            name: 'Scope test project',
-            id: '',
-            ownerId: '',
-            isPublic: true
+    describe('Project Subs', () => {
+      describe('scope tests', () => {
+        const randomProject: BasicTestStream = {
+          name: 'Scope test project',
+          id: '',
+          ownerId: '',
+          isPublic: true
+        }
+        let testClient: Optional<TestApolloSubscriptionClient> = undefined
+
+        before(async () => {
+          randomProject.workspaceId = myMainWorkspace.id
+          await createTestStreams([[randomProject, me]])
+        })
+
+        afterEach(async () => {
+          testClient?.quit()
+        })
+
+        type ScopeTest = {
+          title: string
+          withoutScope: ServerScope
+          expectedMessages: number
+          sub: () => {
+            query: any
+            variables: any
           }
-          let testClient: Optional<TestApolloSubscriptionClient> = undefined
+          triggerMessage: () => Promise<void>
+        }
 
-          before(async () => {
-            randomProject.workspaceId = myMainWorkspace.id
-            await createTestStreams([[randomProject, me]])
-          })
+        const triggerProjectUpdate = async () => {
+          const projectId = randomProject.id
+          const updateProject = await buildUpdateProject({ projectId })
+          await updateProject({ id: projectId, name: new Date().toISOString() }, me.id)
+        }
 
-          afterEach(async () => {
-            testClient?.quit()
-          })
-
-          type ScopeTest = {
-            title: string
-            withoutScope: ServerScope
-            sub: () => {
-              query: any
-              variables: any
-            }
-            triggerMessage: () => Promise<void>
-          }
-
-          const triggerProjectUpdate = async () => {
-            const projectId = randomProject.id
-            const updateProject = await buildUpdateProject({ projectId })
-            await updateProject(
-              { id: projectId, name: new Date().toISOString() },
-              me.id
-            )
-          }
-
-          const scopeTests: ScopeTest[] = [
-            {
-              title: 'streamUpdated()',
-              withoutScope: Scopes.Streams.Read,
-              sub: () => ({
-                query: OnStreamUpdatedDocument,
-                variables: { streamId: randomProject.id }
-              }),
-              triggerMessage: triggerProjectUpdate
-            },
-            {
-              title: 'projectUpdated()',
-              withoutScope: Scopes.Streams.Read,
-              sub: () => ({
-                query: OnProjectUpdatedDocument,
-                variables: { projectId: randomProject.id }
-              }),
-              triggerMessage: triggerProjectUpdate
-            },
-            {
-              title: 'userProjectsUpdated()',
-              withoutScope: Scopes.Profile.Read,
-              sub: () => ({
-                query: OnUserProjectsUpdatedDocument,
-                variables: {}
-              }),
-              triggerMessage: async () => {
-                // Create a new project
-                const newProject: BasicTestStream = {
-                  name: 'New Scope Test Project',
-                  id: '',
-                  ownerId: me.id,
-                  isPublic: true,
-                  workspaceId: myMainWorkspace.id
-                }
-
-                await createTestStreams([[newProject, me]])
+        const scopeTests: ScopeTest[] = [
+          {
+            title: 'streamUpdated()',
+            withoutScope: Scopes.Streams.Read,
+            expectedMessages: 1,
+            sub: () => ({
+              query: OnStreamUpdatedDocument,
+              variables: { streamId: randomProject.id }
+            }),
+            triggerMessage: triggerProjectUpdate
+          },
+          {
+            title: 'projectUpdated()',
+            withoutScope: Scopes.Streams.Read,
+            expectedMessages: 1,
+            sub: () => ({
+              query: OnProjectUpdatedDocument,
+              variables: { projectId: randomProject.id }
+            }),
+            triggerMessage: triggerProjectUpdate
+          },
+          {
+            title: 'userProjectsUpdated()',
+            withoutScope: Scopes.Profile.Read,
+            expectedMessages: 2,
+            sub: () => ({
+              query: OnUserProjectsUpdatedDocument,
+              variables: {}
+            }),
+            triggerMessage: async () => {
+              // Create a new project
+              const newProject: BasicTestStream = {
+                name: 'New Scope Test Project',
+                id: '',
+                ownerId: me.id,
+                isPublic: true,
+                workspaceId: myMainWorkspace.id
               }
-            }
-          ]
 
-          scopeTests.forEach(({ title, withoutScope, sub, triggerMessage }) => {
+              await createTestStreams([[newProject, me]])
+            }
+          }
+        ]
+
+        scopeTests.forEach(
+          ({ title, withoutScope, sub, triggerMessage, expectedMessages }) => {
             itEach(
               [{ allow: false }, { allow: true }],
               ({ allow }) =>
-                `should ${allow ? '' : 'not '} allow ${title} sub with${
+                `should${allow ? '' : ' not'} allow ${title} sub with${
                   !allow ? 'out' : ''
                 } ${withoutScope} scope`,
               async ({ allow }) => {
@@ -364,754 +365,760 @@ describe('Core GraphQL Subscriptions (New)', () => {
                 await triggerMessage()
                 await onMessage.waitForMessage()
 
-                expect(onMessage.getMessages()).to.have.length(1)
+                if (isMultiRegion && title === 'userProjectsUpdated()') {
+                  // should have 2 but sometimes the expectancy hits before it gets the second event only in multiregion setups and for this specific case
+                  expect(onMessage.getMessages()).to.have.length.gte(1)
+                  expect(onMessage.getMessages()).to.have.length.lessThan(3)
+                } else {
+                  expect(onMessage.getMessages()).to.have.lengthOf(expectedMessages)
+                }
               }
             )
-          })
-        })
-
-        it('should notify me of a new project (userProjectsUpdated/userStreamAdded)', async () => {
-          const onUserProjectsUpdated = await meSubClient.subscribe(
-            OnUserProjectsUpdatedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userProjectsUpdated.type).to.equal(
-                UserProjectsUpdatedMessageType.Added
-              )
-              expect(res.data?.userProjectsUpdated.project?.name).to.equal(myProj.name)
-            }
-          )
-          const onUserStreamAdded = await meSubClient.subscribe(
-            OnUserStreamAddedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userStreamAdded?.name).to.equal(myProj.name)
-            }
-          )
-          await meSubClient.waitForReadiness()
-
-          const myProj: BasicTestStream = {
-            name: 'My New Test1 Project',
-            id: '',
-            ownerId: me.id,
-            isPublic: true,
-            workspaceId: myMainWorkspace.id
-          }
-          const otherGuysProj: BasicTestStream = {
-            name: 'Other Guys Project',
-            id: '',
-            ownerId: otherGuy.id,
-            isPublic: true,
-            workspaceId: otherGuysWorkspace.id
-          }
-          await createTestStreams([
-            [myProj, me],
-            [otherGuysProj, otherGuy]
-          ])
-          await Promise.all([
-            onUserProjectsUpdated.waitForMessage(),
-            onUserStreamAdded.waitForMessage()
-          ])
-
-          expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
-          expect(onUserStreamAdded.getMessages()).to.have.length(1)
-        })
-
-        it('should notify me of a project ive just been added to (userProjectsUpdated/userStreamAdded)', async () => {
-          const otherGuysProj: BasicTestStream = {
-            name: 'Other Guys Project #1',
-            id: '',
-            ownerId: otherGuy.id,
-            isPublic: true,
-            workspaceId: otherGuysWorkspace.id
-          }
-          await createTestStreams([[otherGuysProj, otherGuy]])
-
-          const onUserProjectsUpdated = await meSubClient.subscribe(
-            OnUserProjectsUpdatedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userProjectsUpdated.type).to.equal(
-                UserProjectsUpdatedMessageType.Added
-              )
-              expect(res.data?.userProjectsUpdated.project?.id).to.equal(
-                otherGuysProj.id
-              )
-            }
-          )
-          const onUserStreamAdded = await meSubClient.subscribe(
-            OnUserStreamAddedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userStreamAdded?.id).to.equal(otherGuysProj.id)
-            }
-          )
-          await meSubClient.waitForReadiness()
-
-          await addOrUpdateStreamCollaborator(
-            otherGuysProj.id,
-            me.id,
-            Roles.Stream.Contributor,
-            otherGuy.id
-          )
-
-          await Promise.all([
-            onUserProjectsUpdated.waitForMessage(),
-            onUserStreamAdded.waitForMessage()
-          ])
-
-          expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
-          expect(onUserStreamAdded.getMessages()).to.have.length(1)
-        })
-
-        it('should notify me of a removed project (userProjectsUpdated/userStreamRemoved)', async () => {
-          const myProj: BasicTestStream = {
-            name: 'My New Test2 Project',
-            id: '',
-            ownerId: me.id,
-            isPublic: true,
-            workspaceId: myMainWorkspace.id
-          }
-          await createTestStreams([[myProj, me]])
-          const deleteProject = await buildDeleteProject({
-            projectId: myProj.id,
-            ownerId: me.id
-          })
-
-          const onUserProjectsUpdated = await meSubClient.subscribe(
-            OnUserProjectsUpdatedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userProjectsUpdated.type).to.equal(
-                UserProjectsUpdatedMessageType.Removed
-              )
-              expect(res.data?.userProjectsUpdated.id).to.equal(myProj.id)
-            }
-          )
-          const onUserStreamRemoved = await meSubClient.subscribe(
-            OnUserStreamRemovedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userStreamRemoved?.id).to.equal(myProj.id)
-            }
-          )
-          await meSubClient.waitForReadiness()
-          await deleteProject()
-
-          await Promise.all([
-            onUserProjectsUpdated.waitForMessage(),
-            onUserStreamRemoved.waitForMessage()
-          ])
-
-          expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
-          expect(onUserStreamRemoved.getMessages()).to.have.length(1)
-        })
-
-        it('should notify me of a project ive just been removed from (userProjectsUpdated/userStreamRemoved)', async () => {
-          const otherGuysProj: BasicTestStream = {
-            name: 'Other Guys Project #2',
-            id: '',
-            ownerId: otherGuy.id,
-            isPublic: true,
-            workspaceId: otherGuysWorkspace.id
-          }
-          await createTestStreams([[otherGuysProj, otherGuy]])
-          await addOrUpdateStreamCollaborator(
-            otherGuysProj.id,
-            me.id,
-            Roles.Stream.Contributor,
-            otherGuy.id
-          )
-
-          const onUserProjectsUpdated = await meSubClient.subscribe(
-            OnUserProjectsUpdatedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userProjectsUpdated.type).to.equal(
-                UserProjectsUpdatedMessageType.Removed
-              )
-              expect(res.data?.userProjectsUpdated.id).to.equal(otherGuysProj.id)
-            }
-          )
-          const onUserStreamRemoved = await meSubClient.subscribe(
-            OnUserStreamRemovedDocument,
-            {},
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.userStreamRemoved?.id).to.equal(otherGuysProj.id)
-            }
-          )
-          await meSubClient.waitForReadiness()
-          await removeStreamCollaborator(otherGuysProj.id, me.id, otherGuy.id, null)
-
-          await Promise.all([
-            onUserProjectsUpdated.waitForMessage(),
-            onUserStreamRemoved.waitForMessage()
-          ])
-
-          expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
-          expect(onUserStreamRemoved.getMessages()).to.have.length(1)
-        })
-
-        it('should notify me of a project update (projectUpdated/streamUpdate)', async () => {
-          const myProj: BasicTestStream = {
-            name: 'My New Test3 Project',
-            id: '',
-            ownerId: me.id,
-            isPublic: true,
-            workspaceId: myMainWorkspace.id
-          }
-          await createTestStreams([[myProj, me]])
-          const updateProject = await buildUpdateProject({ projectId: myProj.id })
-
-          const onUserProjectsUpdated = await meSubClient.subscribe(
-            OnProjectUpdatedDocument,
-            { projectId: myProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.projectUpdated.type).to.equal(
-                ProjectUpdatedMessageType.Updated
-              )
-              expect(res.data?.projectUpdated.project?.id).to.equal(myProj.id)
-            }
-          )
-          const onStreamUpdated = await meSubClient.subscribe(
-            OnStreamUpdatedDocument,
-            { streamId: myProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.streamUpdated?.id).to.equal(myProj.id)
-            }
-          )
-          await meSubClient.waitForReadiness()
-          await updateProject({ id: myProj.id, name: 'Updated Project Name' }, me.id)
-
-          await Promise.all([
-            onUserProjectsUpdated.waitForMessage(),
-            onStreamUpdated.waitForMessage()
-          ])
-
-          expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
-          expect(onStreamUpdated.getMessages()).to.have.length(1)
-        })
-
-        it('should not notify me of a project update for a different project', async () => {
-          const myProj: BasicTestStream = {
-            name: 'My New Test4 Project',
-            id: '',
-            ownerId: me.id,
-            isPublic: true,
-            workspaceId: myMainWorkspace.id
-          }
-          await createTestStreams([[myProj, me]])
-          const updateProject = await buildUpdateProject({ projectId: myProj.id })
-
-          const onUserProjectsUpdated = await meSubClient.subscribe(
-            OnProjectUpdatedDocument,
-            { projectId: 'aaa' },
-            (res) => {
-              throw new TestError('Message received for wrong project', {
-                info: { res }
-              })
-            }
-          )
-          const onStreamUpdated = await meSubClient.subscribe(
-            OnStreamUpdatedDocument,
-            { streamId: 'bbb' },
-            (res) => {
-              throw new TestError('Message received for wrong project', {
-                info: { res }
-              })
-            }
-          )
-          await meSubClient.waitForReadiness()
-          await updateProject({ id: myProj.id, name: 'Updated Project Name' }, me.id)
-
-          await Promise.all([
-            onUserProjectsUpdated.waitForTimeout(),
-            onStreamUpdated.waitForTimeout()
-          ])
-
-          expect(onUserProjectsUpdated.getMessages()).to.have.length(0)
-          expect(onStreamUpdated.getMessages()).to.have.length(0)
-        })
-      })
-
-      describe('Version Subs', () => {
-        const myVersionProj: BasicTestStream = {
-          name: 'My New Version Project #1',
-          id: '',
-          ownerId: '',
-          isPublic: true
-        }
-
-        before(async () => {
-          myVersionProj.workspaceId = myMainWorkspace.id
-          await createTestStreams([[myVersionProj, me]])
-        })
-
-        it(`should notify me of a new version (projectVersionsUpdated/commitCreated)`, async () => {
-          const message = 'ayyyooo'
-          const onUserProjectVersionsUpdated = await meSubClient.subscribe(
-            OnUserProjectVersionsUpdatedDocument,
-            { projectId: myVersionProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.projectVersionsUpdated.type).to.equal(
-                ProjectVersionsUpdatedMessageType.Created
-              )
-              expect(res.data?.projectVersionsUpdated.version?.message).to.equal(
-                message
-              )
-            }
-          )
-          const onUserStreamCommitCreated = await meSubClient.subscribe(
-            OnUserStreamCommitCreatedDocument,
-            { streamId: myVersionProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.commitCreated?.message).to.equal(message)
-            }
-          )
-          await meSubClient.waitForReadiness()
-
-          // Create test commit
-          const commit: BasicTestCommit = {
-            streamId: '',
-            objectId: '',
-            id: '',
-            authorId: '',
-            branchId: '',
-            message
-          }
-
-          await createTestCommits([commit], { owner: me, stream: myVersionProj })
-
-          await Promise.all([
-            onUserProjectVersionsUpdated.waitForMessage(),
-            onUserStreamCommitCreated.waitForMessage()
-          ])
-
-          expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(1)
-          expect(onUserStreamCommitCreated.getMessages()).to.have.length(1)
-        })
-
-        it('should notify me when a version is deleted (projectVersionsUpdated/commitDeleted)', async () => {
-          const commitToDelete: BasicTestCommit = {
-            streamId: '',
-            objectId: '',
-            id: '',
-            authorId: '',
-            branchId: '',
-            message: 'Commit to Delete'
-          }
-          await createTestCommits([commitToDelete], {
-            owner: me,
-            stream: myVersionProj
-          })
-          const deleteVersion = await buildDeleteVersion({
-            projectId: myVersionProj.id
-          })
-
-          const onUserProjectVersionsUpdated = await meSubClient.subscribe(
-            OnUserProjectVersionsUpdatedDocument,
-            { projectId: myVersionProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.projectVersionsUpdated.type).to.equal(
-                ProjectVersionsUpdatedMessageType.Deleted
-              )
-              expect(res.data?.projectVersionsUpdated.id).to.equal(commitToDelete.id)
-            }
-          )
-          const onUserStreamCommitDeleted = await meSubClient.subscribe(
-            OnUserStreamCommitDeletedDocument,
-            { streamId: myVersionProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.commitDeleted?.id).to.equal(commitToDelete.id)
-            }
-          )
-          await meSubClient.waitForReadiness()
-          await deleteVersion(
-            {
-              versionIds: [commitToDelete.id],
-              projectId: myVersionProj.id
-            },
-            me.id
-          )
-
-          await Promise.all([
-            onUserProjectVersionsUpdated.waitForMessage(),
-            onUserStreamCommitDeleted.waitForMessage()
-          ])
-
-          expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(1)
-          expect(onUserStreamCommitDeleted.getMessages()).to.have.length(1)
-        })
-
-        it('should notify me when a version is updated (projectVersionsUpdated/commitUpdated)', async () => {
-          const commitToUpdate: BasicTestCommit = {
-            streamId: '',
-            objectId: '',
-            id: '',
-            authorId: '',
-            branchId: '',
-            message: 'Commit to Update'
-          }
-          await createTestCommits([commitToUpdate], {
-            owner: me,
-            stream: myVersionProj
-          })
-          const updateVersion = await buildUpdateVersion({
-            projectId: myVersionProj.id
-          })
-
-          const onUserProjectVersionsUpdated = await meSubClient.subscribe(
-            OnUserProjectVersionsUpdatedDocument,
-            { projectId: myVersionProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.projectVersionsUpdated.type).to.equal(
-                ProjectVersionsUpdatedMessageType.Updated
-              )
-              expect(res.data?.projectVersionsUpdated.version?.id).to.equal(
-                commitToUpdate.id
-              )
-            }
-          )
-          const onUserStreamCommitCreated = await meSubClient.subscribe(
-            OnUserStreamCommitUpdatedDocument,
-            { streamId: myVersionProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.commitUpdated?.id).to.equal(commitToUpdate.id)
-            }
-          )
-          await meSubClient.waitForReadiness()
-          await updateVersion(
-            {
-              versionId: commitToUpdate.id,
-              message: 'Updated Message',
-              projectId: myVersionProj.id
-            },
-            me.id
-          )
-
-          await Promise.all([
-            onUserProjectVersionsUpdated.waitForMessage(),
-            onUserStreamCommitCreated.waitForMessage()
-          ])
-
-          expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(1)
-          expect(onUserStreamCommitCreated.getMessages()).to.have.length(1)
-        })
-
-        it('should not notify me when version is created for stream im not authorized for', async () => {
-          const otherGuysProj: BasicTestStream = {
-            name: 'Other Guys Project #3',
-            id: '',
-            ownerId: otherGuy.id,
-            isPublic: false,
-            workspaceId: otherGuysWorkspace.id
-          }
-          await createTestStreams([[otherGuysProj, otherGuy]])
-
-          const onUserProjectVersionsUpdated = await meSubClient.subscribe(
-            OnUserProjectVersionsUpdatedDocument,
-            { projectId: otherGuysProj.id },
-            (res) => {
-              throw new TestError('Message received for wrong project', {
-                info: { res }
-              })
-            }
-          )
-          const onUserStreamCommitCreated = await meSubClient.subscribe(
-            OnUserStreamCommitCreatedDocument,
-            { streamId: otherGuysProj.id },
-            (res) => {
-              throw new TestError('Message received for wrong project', {
-                info: { res }
-              })
-            }
-          )
-          await meSubClient.waitForReadiness()
-
-          const commit: BasicTestCommit = {
-            streamId: otherGuysProj.id,
-            objectId: '',
-            id: '',
-            authorId: '',
-            branchId: '',
-            message: 'Random Commit'
-          }
-          await createTestCommits([commit], {
-            owner: otherGuy,
-            stream: otherGuysProj
-          })
-
-          await Promise.all([
-            onUserProjectVersionsUpdated.waitForTimeout(),
-            onUserStreamCommitCreated.waitForTimeout()
-          ])
-
-          expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(0)
-          expect(onUserStreamCommitCreated.getMessages()).to.have.length(0)
-        })
-      })
-
-      describe('Model Subs', () => {
-        const myModelProj: BasicTestStream = {
-          name: 'My New Model Project #1',
-          id: '',
-          ownerId: '',
-          isPublic: true
-        }
-
-        before(async () => {
-          myModelProj.workspaceId = myMainWorkspace.id
-          await createTestStreams([[myModelProj, me]])
-        })
-
-        it(`should notify me of a new model (projectModelsUpdated/branchCreated)`, async () => {
-          const newModel: BasicTestBranch = {
-            name: 'Some New Fangled kind of Model',
-            streamId: '',
-            authorId: '',
-            id: ''
-          }
-
-          const onProjectModelsUpdated = await meSubClient.subscribe(
-            OnProjectModelsUpdatedDocument,
-            { projectId: myModelProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-
-              // name should be lowercaseified
-              expect(res.data?.projectModelsUpdated.model?.name).to.equal(
-                newModel.name.toLowerCase()
-              )
-              expect(res.data?.projectModelsUpdated.type).to.equal(
-                ProjectModelsUpdatedMessageType.Created
-              )
-            }
-          )
-          const onBranchCreated = await meSubClient.subscribe(
-            OnBranchCreatedDocument,
-            { streamId: myModelProj.id },
-            (res) => {
-              expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.branchCreated?.name).to.equal(
-                newModel.name.toLowerCase()
-              )
-            }
-          )
-          await meSubClient.waitForReadiness()
-
-          await createTestBranch({ branch: newModel, stream: myModelProj, owner: me })
-          await Promise.all([
-            onProjectModelsUpdated.waitForMessage(),
-            onBranchCreated.waitForMessage()
-          ])
-
-          expect(onProjectModelsUpdated.getMessages()).to.have.length(1)
-          expect(onBranchCreated.getMessages()).to.have.length(1)
-        })
-
-        itEach(
-          [{ any: false }, { any: true }],
-          ({ any }) =>
-            `should notify me of ${
-              any ? 'any ' : ''
-            }updated model (projectModelsUpdated/branchUpdated)`,
-          async ({ any }) => {
-            // Create 2 models
-            const firstModel: BasicTestBranch = {
-              name: 'First Model ' + faker.number.int(),
-              streamId: '',
-              authorId: '',
-              id: ''
-            }
-            const secondModel: BasicTestBranch = {
-              name: 'Second Model ' + faker.number.int(),
-              streamId: '',
-              authorId: '',
-              id: ''
-            }
-            await createTestBranches([
-              { branch: firstModel, stream: myModelProj, owner: me },
-              { branch: secondModel, stream: myModelProj, owner: me }
-            ])
-            const updateModel = await buildUpdateModel({ projectId: myModelProj.id })
-
-            // Sub
-            const onProjectModelsUpdated = await meSubClient.subscribe(
-              OnProjectModelsUpdatedDocument,
-              {
-                projectId: myModelProj.id,
-                ...(!any ? { modelIds: [firstModel.id] } : {})
-              },
-              (res) => {
-                expect(res).to.not.haveGraphQLErrors()
-
-                const modelId = res.data?.projectModelsUpdated.model?.id
-                expect([firstModel.id, ...(any ? [secondModel.id] : [])]).to.include(
-                  modelId
-                )
-                expect(res.data?.projectModelsUpdated.type).to.equal(
-                  ProjectModelsUpdatedMessageType.Updated
-                )
-              }
-            )
-            const onBranchUpdated = await meSubClient.subscribe(
-              OnBranchUpdatedDocument,
-              {
-                streamId: myModelProj.id,
-                branchId: !any ? firstModel.id : undefined
-              },
-              (res) => {
-                expect(res).to.not.haveGraphQLErrors()
-                const modelId = res.data?.branchUpdated?.id
-                expect([firstModel.id, ...(any ? [secondModel.id] : [])]).to.include(
-                  modelId
-                )
-              }
-            )
-            await meSubClient.waitForReadiness()
-
-            // Update both models
-            await Promise.all([
-              updateModel(
-                {
-                  id: firstModel.id,
-                  name: 'First Model New Name' + faker.number.int(),
-                  projectId: myModelProj.id
-                },
-                me.id
-              ),
-              updateModel(
-                {
-                  id: secondModel.id,
-                  name: 'Second Model New Name' + faker.number.int(),
-                  projectId: myModelProj.id
-                },
-                me.id
-              )
-            ])
-
-            await Promise.all([
-              onProjectModelsUpdated.waitForMessage(),
-              onBranchUpdated.waitForMessage()
-            ])
-
-            expect(onProjectModelsUpdated.getMessages()).to.have.length(any ? 2 : 1)
-            expect(onBranchUpdated.getMessages()).to.have.length(any ? 2 : 1)
           }
         )
+      })
 
-        it('should notify me of model delete (projectModelsUpdated/branchDeleted)', async () => {
-          const modelToDelete: BasicTestBranch = {
-            name: 'Model to Delete',
+      it('should notify me of a new project (userProjectsUpdated/userStreamAdded)', async () => {
+        const onUserProjectsUpdated = await meSubClient.subscribe(
+          OnUserProjectsUpdatedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.userProjectsUpdated.type).to.equal(
+              UserProjectsUpdatedMessageType.Added
+            )
+            expect(res.data?.userProjectsUpdated.project?.name).to.equal(myProj.name)
+          }
+        )
+        const onUserStreamAdded = await meSubClient.subscribe(
+          OnUserStreamAddedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            const event = res.data?.userStreamAdded
+            if (event && 'sharedBy' in event) {
+              expect(res.data?.userStreamAdded?.sharedBy).to.equal(me.id)
+              return
+            }
+
+            expect(res.data?.userStreamAdded?.name).to.equal(myProj.name)
+          }
+        )
+        await meSubClient.waitForReadiness()
+
+        const myProj: BasicTestStream = {
+          name: 'My New Test1 Project',
+          id: '',
+          ownerId: me.id,
+          isPublic: true,
+          workspaceId: myMainWorkspace.id
+        }
+        const otherGuysProj: BasicTestStream = {
+          name: 'Other Guys Project',
+          id: '',
+          ownerId: otherGuy.id,
+          isPublic: true,
+          workspaceId: otherGuysWorkspace.id
+        }
+        await createTestStreams([
+          [myProj, me],
+          [otherGuysProj, otherGuy]
+        ])
+        await Promise.all([
+          onUserProjectsUpdated.waitForMessage(),
+          onUserStreamAdded.waitForMessage()
+        ])
+
+        expect(onUserProjectsUpdated.getMessages()).to.have.lengthOf(2)
+        expect(onUserStreamAdded.getMessages()).to.have.lengthOf(2)
+      })
+
+      it('should notify me of a project ive just been added to (userProjectsUpdated/userStreamAdded)', async () => {
+        const otherGuysProj: BasicTestStream = {
+          name: 'Other Guys Project #1',
+          id: '',
+          ownerId: otherGuy.id,
+          isPublic: true,
+          workspaceId: otherGuysWorkspace.id
+        }
+        await createTestStreams([[otherGuysProj, otherGuy]])
+
+        const onUserProjectsUpdated = await meSubClient.subscribe(
+          OnUserProjectsUpdatedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.userProjectsUpdated.type).to.equal(
+              UserProjectsUpdatedMessageType.Added
+            )
+            expect(res.data?.userProjectsUpdated.project?.id).to.equal(otherGuysProj.id)
+          }
+        )
+        const onUserStreamAdded = await meSubClient.subscribe(
+          OnUserStreamAddedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.userStreamAdded?.id).to.equal(otherGuysProj.id)
+          }
+        )
+        await meSubClient.waitForReadiness()
+
+        await addOrUpdateStreamCollaborator(
+          otherGuysProj.id,
+          me.id,
+          Roles.Stream.Contributor,
+          otherGuy.id
+        )
+
+        await Promise.all([
+          onUserProjectsUpdated.waitForMessage(),
+          onUserStreamAdded.waitForMessage()
+        ])
+
+        expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
+        expect(onUserStreamAdded.getMessages()).to.have.length(1)
+      })
+
+      it('should notify me of a removed project (userProjectsUpdated/userStreamRemoved)', async () => {
+        const myProj: BasicTestStream = {
+          name: 'My New Test2 Project',
+          id: '',
+          ownerId: me.id,
+          isPublic: true,
+          workspaceId: myMainWorkspace.id
+        }
+        await createTestStreams([[myProj, me]])
+        const deleteProject = await buildDeleteProject({
+          projectId: myProj.id,
+          ownerId: me.id
+        })
+
+        const onUserProjectsUpdated = await meSubClient.subscribe(
+          OnUserProjectsUpdatedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.userProjectsUpdated.type).to.equal(
+              UserProjectsUpdatedMessageType.Removed
+            )
+            expect(res.data?.userProjectsUpdated.id).to.equal(myProj.id)
+          }
+        )
+        const onUserStreamRemoved = await meSubClient.subscribe(
+          OnUserStreamRemovedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.userStreamRemoved?.id).to.equal(myProj.id)
+          }
+        )
+        await meSubClient.waitForReadiness()
+        await deleteProject()
+
+        await Promise.all([
+          onUserProjectsUpdated.waitForMessage(),
+          onUserStreamRemoved.waitForMessage()
+        ])
+
+        expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
+        expect(onUserStreamRemoved.getMessages()).to.have.length(1)
+      })
+
+      it('should notify me of a project ive just been removed from (userProjectsUpdated/userStreamRemoved)', async () => {
+        const otherGuysProj: BasicTestStream = {
+          name: 'Other Guys Project #2',
+          id: '',
+          ownerId: otherGuy.id,
+          isPublic: true,
+          workspaceId: otherGuysWorkspace.id
+        }
+        await createTestStreams([[otherGuysProj, otherGuy]])
+        await addOrUpdateStreamCollaborator(
+          otherGuysProj.id,
+          me.id,
+          Roles.Stream.Contributor,
+          otherGuy.id
+        )
+
+        const onUserProjectsUpdated = await meSubClient.subscribe(
+          OnUserProjectsUpdatedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.userProjectsUpdated.type).to.equal(
+              UserProjectsUpdatedMessageType.Removed
+            )
+            expect(res.data?.userProjectsUpdated.id).to.equal(otherGuysProj.id)
+          }
+        )
+        const onUserStreamRemoved = await meSubClient.subscribe(
+          OnUserStreamRemovedDocument,
+          {},
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.userStreamRemoved?.id).to.equal(otherGuysProj.id)
+          }
+        )
+        await meSubClient.waitForReadiness()
+        await removeStreamCollaborator(otherGuysProj.id, me.id, otherGuy.id, null)
+
+        await Promise.all([
+          onUserProjectsUpdated.waitForMessage(),
+          onUserStreamRemoved.waitForMessage()
+        ])
+
+        expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
+        expect(onUserStreamRemoved.getMessages()).to.have.length(1)
+      })
+
+      it('should notify me of a project update (projectUpdated/streamUpdate)', async () => {
+        const myProj: BasicTestStream = {
+          name: 'My New Test3 Project',
+          id: '',
+          ownerId: me.id,
+          isPublic: true,
+          workspaceId: myMainWorkspace.id
+        }
+        await createTestStreams([[myProj, me]])
+        const updateProject = await buildUpdateProject({ projectId: myProj.id })
+
+        const onUserProjectsUpdated = await meSubClient.subscribe(
+          OnProjectUpdatedDocument,
+          { projectId: myProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.projectUpdated.type).to.equal(
+              ProjectUpdatedMessageType.Updated
+            )
+            expect(res.data?.projectUpdated.project?.id).to.equal(myProj.id)
+          }
+        )
+        const onStreamUpdated = await meSubClient.subscribe(
+          OnStreamUpdatedDocument,
+          { streamId: myProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.streamUpdated?.id).to.equal(myProj.id)
+          }
+        )
+        await meSubClient.waitForReadiness()
+        await updateProject({ id: myProj.id, name: 'Updated Project Name' }, me.id)
+
+        await Promise.all([
+          onUserProjectsUpdated.waitForMessage(),
+          onStreamUpdated.waitForMessage()
+        ])
+
+        expect(onUserProjectsUpdated.getMessages()).to.have.length(1)
+        expect(onStreamUpdated.getMessages()).to.have.length(1)
+      })
+
+      it('should not notify me of a project update for a different project', async () => {
+        const myProj: BasicTestStream = {
+          name: 'My New Test4 Project',
+          id: '',
+          ownerId: me.id,
+          isPublic: true,
+          workspaceId: myMainWorkspace.id
+        }
+        await createTestStreams([[myProj, me]])
+        const updateProject = await buildUpdateProject({ projectId: myProj.id })
+
+        const onUserProjectsUpdated = await meSubClient.subscribe(
+          OnProjectUpdatedDocument,
+          { projectId: 'aaa' },
+          (res) => {
+            throw new TestError('Message received for wrong project', {
+              info: { res }
+            })
+          }
+        )
+        const onStreamUpdated = await meSubClient.subscribe(
+          OnStreamUpdatedDocument,
+          { streamId: 'bbb' },
+          (res) => {
+            throw new TestError('Message received for wrong project', {
+              info: { res }
+            })
+          }
+        )
+        await meSubClient.waitForReadiness()
+        await updateProject({ id: myProj.id, name: 'Updated Project Name' }, me.id)
+
+        await Promise.all([
+          onUserProjectsUpdated.waitForTimeout(),
+          onStreamUpdated.waitForTimeout()
+        ])
+
+        expect(onUserProjectsUpdated.getMessages()).to.have.length(0)
+        expect(onStreamUpdated.getMessages()).to.have.length(0)
+      })
+    })
+
+    describe('Version Subs', () => {
+      const myVersionProj: BasicTestStream = {
+        name: 'My New Version Project #1',
+        id: '',
+        ownerId: '',
+        isPublic: true
+      }
+
+      before(async () => {
+        myVersionProj.workspaceId = myMainWorkspace.id
+        await createTestStreams([[myVersionProj, me]])
+      })
+
+      it(`should notify me of a new version (projectVersionsUpdated/commitCreated)`, async () => {
+        const message = 'ayyyooo'
+        const onUserProjectVersionsUpdated = await meSubClient.subscribe(
+          OnUserProjectVersionsUpdatedDocument,
+          { projectId: myVersionProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.projectVersionsUpdated.type).to.equal(
+              ProjectVersionsUpdatedMessageType.Created
+            )
+            expect(res.data?.projectVersionsUpdated.version?.message).to.equal(message)
+          }
+        )
+        const onUserStreamCommitCreated = await meSubClient.subscribe(
+          OnUserStreamCommitCreatedDocument,
+          { streamId: myVersionProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.commitCreated?.message).to.equal(message)
+          }
+        )
+        await meSubClient.waitForReadiness()
+
+        // Create test commit
+        const commit: BasicTestCommit = {
+          streamId: '',
+          objectId: '',
+          id: '',
+          authorId: '',
+          branchId: '',
+          message
+        }
+
+        await createTestCommits([commit], { owner: me, stream: myVersionProj })
+
+        await Promise.all([
+          onUserProjectVersionsUpdated.waitForMessage(),
+          onUserStreamCommitCreated.waitForMessage()
+        ])
+
+        expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(1)
+        expect(onUserStreamCommitCreated.getMessages()).to.have.length(1)
+      })
+
+      it('should notify me when a version is deleted (projectVersionsUpdated/commitDeleted)', async () => {
+        const commitToDelete: BasicTestCommit = {
+          streamId: '',
+          objectId: '',
+          id: '',
+          authorId: '',
+          branchId: '',
+          message: 'Commit to Delete'
+        }
+        await createTestCommits([commitToDelete], {
+          owner: me,
+          stream: myVersionProj
+        })
+        const deleteVersion = await buildDeleteVersion({
+          projectId: myVersionProj.id
+        })
+
+        const onUserProjectVersionsUpdated = await meSubClient.subscribe(
+          OnUserProjectVersionsUpdatedDocument,
+          { projectId: myVersionProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.projectVersionsUpdated.type).to.equal(
+              ProjectVersionsUpdatedMessageType.Deleted
+            )
+            expect(res.data?.projectVersionsUpdated.id).to.equal(commitToDelete.id)
+          }
+        )
+        const onUserStreamCommitDeleted = await meSubClient.subscribe(
+          OnUserStreamCommitDeletedDocument,
+          { streamId: myVersionProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.commitDeleted?.id).to.equal(commitToDelete.id)
+          }
+        )
+        await meSubClient.waitForReadiness()
+        await deleteVersion(
+          {
+            versionIds: [commitToDelete.id],
+            projectId: myVersionProj.id
+          },
+          me.id
+        )
+
+        await Promise.all([
+          onUserProjectVersionsUpdated.waitForMessage(),
+          onUserStreamCommitDeleted.waitForMessage()
+        ])
+
+        expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(1)
+        expect(onUserStreamCommitDeleted.getMessages()).to.have.length(1)
+      })
+
+      it('should notify me when a version is updated (projectVersionsUpdated/commitUpdated)', async () => {
+        const commitToUpdate: BasicTestCommit = {
+          streamId: '',
+          objectId: '',
+          id: '',
+          authorId: '',
+          branchId: '',
+          message: 'Commit to Update'
+        }
+        await createTestCommits([commitToUpdate], {
+          owner: me,
+          stream: myVersionProj
+        })
+        const updateVersion = await buildUpdateVersion({
+          projectId: myVersionProj.id
+        })
+
+        const onUserProjectVersionsUpdated = await meSubClient.subscribe(
+          OnUserProjectVersionsUpdatedDocument,
+          { projectId: myVersionProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.projectVersionsUpdated.type).to.equal(
+              ProjectVersionsUpdatedMessageType.Updated
+            )
+            expect(res.data?.projectVersionsUpdated.version?.id).to.equal(
+              commitToUpdate.id
+            )
+          }
+        )
+        const onUserStreamCommitCreated = await meSubClient.subscribe(
+          OnUserStreamCommitUpdatedDocument,
+          { streamId: myVersionProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.commitUpdated?.id).to.equal(commitToUpdate.id)
+          }
+        )
+        await meSubClient.waitForReadiness()
+        await updateVersion(
+          {
+            versionId: commitToUpdate.id,
+            message: 'Updated Message',
+            projectId: myVersionProj.id
+          },
+          me.id
+        )
+
+        await Promise.all([
+          onUserProjectVersionsUpdated.waitForMessage(),
+          onUserStreamCommitCreated.waitForMessage()
+        ])
+
+        expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(1)
+        expect(onUserStreamCommitCreated.getMessages()).to.have.length(1)
+      })
+
+      it('should not notify me when version is created for stream im not authorized for', async () => {
+        const otherGuysProj: BasicTestStream = {
+          name: 'Other Guys Project #3',
+          id: '',
+          ownerId: otherGuy.id,
+          isPublic: false,
+          workspaceId: otherGuysWorkspace.id
+        }
+        await createTestStreams([[otherGuysProj, otherGuy]])
+
+        const onUserProjectVersionsUpdated = await meSubClient.subscribe(
+          OnUserProjectVersionsUpdatedDocument,
+          { projectId: otherGuysProj.id },
+          (res) => {
+            throw new TestError('Message received for wrong project', {
+              info: { res }
+            })
+          }
+        )
+        const onUserStreamCommitCreated = await meSubClient.subscribe(
+          OnUserStreamCommitCreatedDocument,
+          { streamId: otherGuysProj.id },
+          (res) => {
+            throw new TestError('Message received for wrong project', {
+              info: { res }
+            })
+          }
+        )
+        await meSubClient.waitForReadiness()
+
+        const commit: BasicTestCommit = {
+          streamId: otherGuysProj.id,
+          objectId: '',
+          id: '',
+          authorId: '',
+          branchId: '',
+          message: 'Random Commit'
+        }
+        await createTestCommits([commit], {
+          owner: otherGuy,
+          stream: otherGuysProj
+        })
+
+        await Promise.all([
+          onUserProjectVersionsUpdated.waitForTimeout(),
+          onUserStreamCommitCreated.waitForTimeout()
+        ])
+
+        expect(onUserProjectVersionsUpdated.getMessages()).to.have.length(0)
+        expect(onUserStreamCommitCreated.getMessages()).to.have.length(0)
+      })
+    })
+
+    describe('Model Subs', () => {
+      const myModelProj: BasicTestStream = {
+        name: 'My New Model Project #1',
+        id: '',
+        ownerId: '',
+        isPublic: true
+      }
+
+      before(async () => {
+        myModelProj.workspaceId = myMainWorkspace.id
+        await createTestStreams([[myModelProj, me]])
+      })
+
+      it(`should notify me of a new model (projectModelsUpdated/branchCreated)`, async () => {
+        const newModel: BasicTestBranch = {
+          name: 'Some New Fangled kind of Model',
+          streamId: '',
+          authorId: '',
+          id: ''
+        }
+
+        const onProjectModelsUpdated = await meSubClient.subscribe(
+          OnProjectModelsUpdatedDocument,
+          { projectId: myModelProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+
+            // name should be lowercaseified
+            expect(res.data?.projectModelsUpdated.model?.name).to.equal(
+              newModel.name.toLowerCase()
+            )
+            expect(res.data?.projectModelsUpdated.type).to.equal(
+              ProjectModelsUpdatedMessageType.Created
+            )
+          }
+        )
+        const onBranchCreated = await meSubClient.subscribe(
+          OnBranchCreatedDocument,
+          { streamId: myModelProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.branchCreated?.name).to.equal(newModel.name.toLowerCase())
+          }
+        )
+        await meSubClient.waitForReadiness()
+
+        await createTestBranch({ branch: newModel, stream: myModelProj, owner: me })
+        await Promise.all([
+          onProjectModelsUpdated.waitForMessage(),
+          onBranchCreated.waitForMessage()
+        ])
+
+        expect(onProjectModelsUpdated.getMessages()).to.have.length(1)
+        expect(onBranchCreated.getMessages()).to.have.length(1)
+      })
+
+      itEach(
+        [{ any: false }, { any: true }],
+        ({ any }) =>
+          `should notify me of ${
+            any ? 'any ' : ''
+          }updated model (projectModelsUpdated/branchUpdated)`,
+        async ({ any }) => {
+          // Create 2 models
+          const firstModel: BasicTestBranch = {
+            name: 'First Model ' + faker.number.int(),
             streamId: '',
             authorId: '',
             id: ''
           }
-          await createTestBranch({
-            branch: modelToDelete,
-            stream: myModelProj,
-            owner: me
-          })
-          const deleteModel = await buildDeleteModel({ projectId: myModelProj.id })
+          const secondModel: BasicTestBranch = {
+            name: 'Second Model ' + faker.number.int(),
+            streamId: '',
+            authorId: '',
+            id: ''
+          }
+          await createTestBranches([
+            { branch: firstModel, stream: myModelProj, owner: me },
+            { branch: secondModel, stream: myModelProj, owner: me }
+          ])
+          const updateModel = await buildUpdateModel({ projectId: myModelProj.id })
 
+          // Sub
           const onProjectModelsUpdated = await meSubClient.subscribe(
             OnProjectModelsUpdatedDocument,
-            { projectId: myModelProj.id },
+            {
+              projectId: myModelProj.id,
+              ...(!any ? { modelIds: [firstModel.id] } : {})
+            },
             (res) => {
               expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.projectModelsUpdated.type).to.equal(
-                ProjectModelsUpdatedMessageType.Deleted
+
+              const modelId = res.data?.projectModelsUpdated.model?.id
+              expect([firstModel.id, ...(any ? [secondModel.id] : [])]).to.include(
+                modelId
+              )
+              expect(res.data?.projectModelsUpdated.type).to.equal(
+                ProjectModelsUpdatedMessageType.Updated
               )
-              expect(res.data?.projectModelsUpdated.id).to.equal(modelToDelete.id)
             }
           )
-          const onBranchDeleted = await meSubClient.subscribe(
-            OnBranchDeletedDocument,
-            { streamId: myModelProj.id },
+          const onBranchUpdated = await meSubClient.subscribe(
+            OnBranchUpdatedDocument,
+            {
+              streamId: myModelProj.id,
+              branchId: !any ? firstModel.id : undefined
+            },
             (res) => {
               expect(res).to.not.haveGraphQLErrors()
-              expect(res.data?.branchDeleted?.id).to.equal(modelToDelete.id)
+              const modelId = res.data?.branchUpdated?.id
+              expect([firstModel.id, ...(any ? [secondModel.id] : [])]).to.include(
+                modelId
+              )
             }
           )
           await meSubClient.waitForReadiness()
-          await deleteModel({ id: modelToDelete.id, projectId: myModelProj.id }, me.id)
+
+          // Update both models
+          await Promise.all([
+            updateModel(
+              {
+                id: firstModel.id,
+                name: 'First Model New Name' + faker.number.int(),
+                projectId: myModelProj.id
+              },
+              me.id
+            ),
+            updateModel(
+              {
+                id: secondModel.id,
+                name: 'Second Model New Name' + faker.number.int(),
+                projectId: myModelProj.id
+              },
+              me.id
+            )
+          ])
 
           await Promise.all([
             onProjectModelsUpdated.waitForMessage(),
-            onBranchDeleted.waitForMessage()
+            onBranchUpdated.waitForMessage()
           ])
 
-          expect(onProjectModelsUpdated.getMessages()).to.have.length(1)
-          expect(onBranchDeleted.getMessages()).to.have.length(1)
+          expect(onProjectModelsUpdated.getMessages()).to.have.length(any ? 2 : 1)
+          expect(onBranchUpdated.getMessages()).to.have.length(any ? 2 : 1)
+        }
+      )
+
+      it('should notify me of model delete (projectModelsUpdated/branchDeleted)', async () => {
+        const modelToDelete: BasicTestBranch = {
+          name: 'Model to Delete',
+          streamId: '',
+          authorId: '',
+          id: ''
+        }
+        await createTestBranch({
+          branch: modelToDelete,
+          stream: myModelProj,
+          owner: me
+        })
+        const deleteModel = await buildDeleteModel({ projectId: myModelProj.id })
+
+        const onProjectModelsUpdated = await meSubClient.subscribe(
+          OnProjectModelsUpdatedDocument,
+          { projectId: myModelProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.projectModelsUpdated.type).to.equal(
+              ProjectModelsUpdatedMessageType.Deleted
+            )
+            expect(res.data?.projectModelsUpdated.id).to.equal(modelToDelete.id)
+          }
+        )
+        const onBranchDeleted = await meSubClient.subscribe(
+          OnBranchDeletedDocument,
+          { streamId: myModelProj.id },
+          (res) => {
+            expect(res).to.not.haveGraphQLErrors()
+            expect(res.data?.branchDeleted?.id).to.equal(modelToDelete.id)
+          }
+        )
+        await meSubClient.waitForReadiness()
+        await deleteModel({ id: modelToDelete.id, projectId: myModelProj.id }, me.id)
+
+        await Promise.all([
+          onProjectModelsUpdated.waitForMessage(),
+          onBranchDeleted.waitForMessage()
+        ])
+
+        expect(onProjectModelsUpdated.getMessages()).to.have.length(1)
+        expect(onBranchDeleted.getMessages()).to.have.length(1)
+      })
+
+      it('should not notify me when model is created for stream im not authorized for', async () => {
+        const otherGuysProj: BasicTestStream = {
+          name: 'Other Guys Project #3',
+          id: '',
+          ownerId: otherGuy.id,
+          isPublic: false,
+          workspaceId: otherGuysWorkspace.id
+        }
+        await createTestStreams([[otherGuysProj, otherGuy]])
+
+        const newModel: BasicTestBranch = {
+          name: 'Some New Fangled kind of Model',
+          streamId: '',
+          authorId: '',
+          id: ''
+        }
+
+        const onProjectModelsUpdated = await meSubClient.subscribe(
+          OnProjectModelsUpdatedDocument,
+          { projectId: otherGuysProj.id },
+          (res) => {
+            throw new TestError('Message received for wrong project', {
+              info: { res }
+            })
+          }
+        )
+        const onBranchCreated = await meSubClient.subscribe(
+          OnBranchCreatedDocument,
+          { streamId: otherGuysProj.id },
+          (res) => {
+            throw new TestError('Message received for wrong project', {
+              info: { res }
+            })
+          }
+        )
+        await meSubClient.waitForReadiness()
+
+        await createTestBranch({
+          branch: newModel,
+          stream: otherGuysProj,
+          owner: otherGuy
         })
 
-        it('should not notify me when model is created for stream im not authorized for', async () => {
-          const otherGuysProj: BasicTestStream = {
-            name: 'Other Guys Project #3',
-            id: '',
-            ownerId: otherGuy.id,
-            isPublic: false,
-            workspaceId: otherGuysWorkspace.id
-          }
-          await createTestStreams([[otherGuysProj, otherGuy]])
+        await Promise.all([
+          onProjectModelsUpdated.waitForTimeout(),
+          onBranchCreated.waitForTimeout()
+        ])
 
-          const newModel: BasicTestBranch = {
-            name: 'Some New Fangled kind of Model',
-            streamId: '',
-            authorId: '',
-            id: ''
-          }
-
-          const onProjectModelsUpdated = await meSubClient.subscribe(
-            OnProjectModelsUpdatedDocument,
-            { projectId: otherGuysProj.id },
-            (res) => {
-              throw new TestError('Message received for wrong project', {
-                info: { res }
-              })
-            }
-          )
-          const onBranchCreated = await meSubClient.subscribe(
-            OnBranchCreatedDocument,
-            { streamId: otherGuysProj.id },
-            (res) => {
-              throw new TestError('Message received for wrong project', {
-                info: { res }
-              })
-            }
-          )
-          await meSubClient.waitForReadiness()
-
-          await createTestBranch({
-            branch: newModel,
-            stream: otherGuysProj,
-            owner: otherGuy
-          })
-
-          await Promise.all([
-            onProjectModelsUpdated.waitForTimeout(),
-            onBranchCreated.waitForTimeout()
-          ])
-
-          expect(onProjectModelsUpdated.getMessages()).to.have.length(0)
-          expect(onBranchCreated.getMessages()).to.have.length(0)
-        })
+        expect(onProjectModelsUpdated.getMessages()).to.have.length(0)
+        expect(onBranchCreated.getMessages()).to.have.length(0)
       })
     })
   })
diff --git a/packages/server/modules/core/tests/objects.spec.ts b/packages/server/modules/core/tests/objects.spec.ts
index 2cb8e55ba..49381b823 100644
--- a/packages/server/modules/core/tests/objects.spec.ts
+++ b/packages/server/modules/core/tests/objects.spec.ts
@@ -10,7 +10,8 @@ import { getAnIdForThisOnePlease } from '@/test/helpers'
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
 import {
@@ -119,6 +120,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/core/tests/rest.spec.ts b/packages/server/modules/core/tests/rest.spec.ts
index f427bd523..1669d4094 100644
--- a/packages/server/modules/core/tests/rest.spec.ts
+++ b/packages/server/modules/core/tests/rest.spec.ts
@@ -12,7 +12,8 @@ import { Scopes } from '@speckle/shared'
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
 import {
@@ -92,6 +93,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/core/tests/streams.spec.ts b/packages/server/modules/core/tests/streams.spec.ts
index aa89562d7..3de29147d 100644
--- a/packages/server/modules/core/tests/streams.spec.ts
+++ b/packages/server/modules/core/tests/streams.spec.ts
@@ -18,6 +18,7 @@ import {
   createStreamFactory,
   deleteStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   getStreamsCollaboratorsFactory,
   grantStreamPermissionsFactory,
   markBranchStreamUpdatedFactory,
@@ -163,6 +164,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
@@ -245,6 +247,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 const isStreamCollaborator = isStreamCollaboratorFactory({
diff --git a/packages/server/modules/core/tests/users.spec.ts b/packages/server/modules/core/tests/users.spec.ts
index 22f0e92d5..58b78f727 100644
--- a/packages/server/modules/core/tests/users.spec.ts
+++ b/packages/server/modules/core/tests/users.spec.ts
@@ -37,7 +37,9 @@ import {
   grantStreamPermissionsFactory,
   markCommitStreamUpdatedFactory,
   deleteStreamFactory,
-  getUserDeletableStreamsFactory
+  getUserDeletableStreamsFactory,
+  getStreamRolesFactory,
+  legacyGetStreamsFactory
 } from '@/modules/core/repositories/streams'
 import {
   getObjectFactory,
@@ -128,6 +130,8 @@ import {
   validateStreamAccessFactory
 } from '@/modules/core/services/streams/access'
 import { authorizeResolver } from '@/modules/shared'
+import { getUserWorkspaceSeatsFactory } from '@/modules/workspacesCore/repositories/workspaces'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const getServerInfo = getServerInfoFactory({ db })
 const getUser = legacyGetUserFactory({ db })
@@ -167,6 +171,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
@@ -279,6 +284,10 @@ const deleteUser = deleteUserFactory({
   logger: dbLogger,
   isLastAdminUser: isLastAdminUserFactory({ db }),
   getUserDeletableStreams: getUserDeletableStreamsFactory({ db }),
+  queryAllProjects: queryAllProjectsFactory({
+    getStreams: legacyGetStreamsFactory({ db })
+  }),
+  getUserWorkspaceSeats: getUserWorkspaceSeatsFactory({ db }),
   deleteAllUserInvites: deleteAllUserInvitesFactory({ db }),
   deleteUserRecord: deleteUserRecordFactory({ db }),
   emitEvent: getEventBus().emit
diff --git a/packages/server/modules/core/tests/usersAdmin.spec.ts b/packages/server/modules/core/tests/usersAdmin.spec.ts
index b0b5a29b9..b0ba54406 100644
--- a/packages/server/modules/core/tests/usersAdmin.spec.ts
+++ b/packages/server/modules/core/tests/usersAdmin.spec.ts
@@ -38,12 +38,15 @@ import {
 } from '@/modules/serverinvites/repositories/serverInvites'
 import {
   deleteStreamFactory,
-  getUserDeletableStreamsFactory
+  getUserDeletableStreamsFactory,
+  legacyGetStreamsFactory
 } from '@/modules/core/repositories/streams'
 import { dbLogger } from '@/observability/logging'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { expect } from 'chai'
+import { getUserWorkspaceSeatsFactory } from '@/modules/workspacesCore/repositories/workspaces'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const getUsers = legacyGetPaginatedUsersFactory({ db })
 const countUsers = legacyGetPaginatedUsersCountFactory({ db })
@@ -81,6 +84,10 @@ const deleteUser = deleteUserFactory({
   logger: dbLogger,
   isLastAdminUser: isLastAdminUserFactory({ db }),
   getUserDeletableStreams: getUserDeletableStreamsFactory({ db }),
+  queryAllProjects: queryAllProjectsFactory({
+    getStreams: legacyGetStreamsFactory({ db })
+  }),
+  getUserWorkspaceSeats: getUserWorkspaceSeatsFactory({ db }),
   deleteAllUserInvites: deleteAllUserInvitesFactory({ db }),
   deleteUserRecord: deleteUserRecordFactory({ db }),
   emitEvent: getEventBus().emit
diff --git a/packages/server/modules/core/tests/usersAdminList.spec.ts b/packages/server/modules/core/tests/usersAdminList.spec.ts
index 5b7376970..df292882c 100644
--- a/packages/server/modules/core/tests/usersAdminList.spec.ts
+++ b/packages/server/modules/core/tests/usersAdminList.spec.ts
@@ -12,6 +12,7 @@ import { createAuthedTestContext, ServerAndContext } from '@/test/graphqlHelper'
 import {
   createStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
@@ -86,6 +87,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/fileuploads/tests/helpers/init.ts b/packages/server/modules/fileuploads/tests/helpers/init.ts
index d0eb408a7..bb894e7e8 100644
--- a/packages/server/modules/fileuploads/tests/helpers/init.ts
+++ b/packages/server/modules/fileuploads/tests/helpers/init.ts
@@ -4,6 +4,7 @@ import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import {
   createStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import {
@@ -127,6 +128,7 @@ export const initUploadTestEnvironment = () => {
           validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
           getUser,
           grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+          getStreamRoles: getStreamRolesFactory({ db }),
           emitEvent: getEventBus().emit
         })
       }),
diff --git a/packages/server/modules/gatekeeper/graph/resolvers/index.ts b/packages/server/modules/gatekeeper/graph/resolvers/index.ts
index efc9dd70b..163cfd1b8 100644
--- a/packages/server/modules/gatekeeper/graph/resolvers/index.ts
+++ b/packages/server/modules/gatekeeper/graph/resolvers/index.ts
@@ -55,12 +55,12 @@ import {
 import { assignWorkspaceSeatFactory } from '@/modules/workspaces/services/workspaceSeat'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { getTotalSeatsCountByPlanFactory } from '@/modules/gatekeeper/services/subscriptions'
-import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
 import { legacyGetStreamsFactory } from '@/modules/core/repositories/streams'
 import { getWorkspaceModelCountFactory } from '@/modules/workspaces/services/workspaceLimits'
 import { getProjectDbClient } from '@/modules/multiregion/utils/dbSelector'
 import { getPaginatedProjectModelsTotalCountFactory } from '@/modules/core/repositories/branches'
 import { withOperationLogging } from '@/observability/domain/businessLogging'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const { FF_GATEKEEPER_MODULE_ENABLED, FF_BILLING_INTEGRATION_ENABLED } =
   getFeatureFlags()
@@ -207,7 +207,7 @@ export = FF_GATEKEEPER_MODULE_ENABLED
           const { workspaceId } = parent
 
           return await getWorkspaceModelCountFactory({
-            queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
+            queryAllProjects: queryAllProjectsFactory({
               getStreams: legacyGetStreamsFactory({ db })
             }),
             getPaginatedProjectModelsTotalCount: async (projectId, params) => {
diff --git a/packages/server/modules/notifications/services/handlers/activityDigest.ts b/packages/server/modules/notifications/services/handlers/activityDigest.ts
index 162fc5c68..198f056d7 100644
--- a/packages/server/modules/notifications/services/handlers/activityDigest.ts
+++ b/packages/server/modules/notifications/services/handlers/activityDigest.ts
@@ -25,7 +25,7 @@ import {
   StreamActivitySummary
 } from '@/modules/activitystream/domain/types'
 import { createActivitySummaryFactory } from '@/modules/activitystream/services/summary'
-import { getActivityFactory } from '@/modules/activitystream/repositories'
+import { geUserStreamActivityFactory } from '@/modules/activitystream/repositories'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import { GetServerInfo } from '@/modules/core/domain/server/operations'
@@ -439,7 +439,7 @@ const digestNotificationEmailHandler = digestNotificationEmailHandlerFactory({
   }),
   createActivitySummary: createActivitySummaryFactory({
     getStream: getStreamFactory({ db }),
-    getActivity: getActivityFactory({ db }),
+    getActivity: geUserStreamActivityFactory({ db }),
     getUser: getUserFactory({ db })
   }),
   getServerInfo: getServerInfoFactory({ db }),
diff --git a/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts b/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
index 3c2618a73..744c5eb57 100644
--- a/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
+++ b/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
@@ -71,6 +71,7 @@ import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { sendEmail } from '@/modules/emails/services/sending'
 import {
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import {
@@ -91,6 +92,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 const getServerInfo = getServerInfoFactory({ db })
diff --git a/packages/server/modules/stats/tests/stats.spec.ts b/packages/server/modules/stats/tests/stats.spec.ts
index e8aa12d0a..c557df72f 100644
--- a/packages/server/modules/stats/tests/stats.spec.ts
+++ b/packages/server/modules/stats/tests/stats.spec.ts
@@ -27,6 +27,7 @@ import {
 import {
   createStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory,
   markCommitStreamUpdatedFactory
 } from '@/modules/core/repositories/streams'
@@ -127,6 +128,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/webhooks/tests/cleanup.spec.ts b/packages/server/modules/webhooks/tests/cleanup.spec.ts
index 3fe486d96..cd637832c 100644
--- a/packages/server/modules/webhooks/tests/cleanup.spec.ts
+++ b/packages/server/modules/webhooks/tests/cleanup.spec.ts
@@ -8,6 +8,7 @@ import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import {
   createStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import {
@@ -87,6 +88,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/webhooks/tests/webhooks.spec.ts b/packages/server/modules/webhooks/tests/webhooks.spec.ts
index e1028e7af..d1b4072fb 100644
--- a/packages/server/modules/webhooks/tests/webhooks.spec.ts
+++ b/packages/server/modules/webhooks/tests/webhooks.spec.ts
@@ -25,7 +25,8 @@ import {
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import {
   legacyCreateStreamFactory,
@@ -107,6 +108,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/modules/workspaces/authz/loaders/index.ts b/packages/server/modules/workspaces/authz/loaders/index.ts
index 7bb6af505..45fbf39a4 100644
--- a/packages/server/modules/workspaces/authz/loaders/index.ts
+++ b/packages/server/modules/workspaces/authz/loaders/index.ts
@@ -12,10 +12,10 @@ import {
   getUserEligibleWorkspacesFactory,
   getWorkspaceRoleForUserFactory
 } from '@/modules/workspaces/repositories/workspaces'
-import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
 import { getWorkspaceModelCountFactory } from '@/modules/workspaces/services/workspaceLimits'
 import { getUsersCurrentAndEligibleToBecomeAMemberWorkspaces } from '@/modules/workspaces/services/retrieval'
 import { findEmailsByUserIdFactory } from '@/modules/core/repositories/userEmails'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 // TODO: Move everything to use dataLoaders
 export default defineModuleLoaders(async () => {
@@ -58,7 +58,7 @@ export default defineModuleLoaders(async () => {
     getWorkspaceModelCount: async ({ workspaceId }) => {
       // TODO: Dataloader that has to dynamically pick regional dbs?
       return await getWorkspaceModelCountFactory({
-        queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
+        queryAllProjects: queryAllProjectsFactory({
           getStreams: legacyGetStreamsFactory({ db })
         }),
         getPaginatedProjectModelsTotalCount: async (projectId, params) => {
diff --git a/packages/server/modules/workspaces/domain/operations.ts b/packages/server/modules/workspaces/domain/operations.ts
index 6cdc5234d..5e58b6965 100644
--- a/packages/server/modules/workspaces/domain/operations.ts
+++ b/packages/server/modules/workspaces/domain/operations.ts
@@ -22,7 +22,7 @@ import {
 } from '@speckle/shared'
 import { WorkspaceCreationState } from '@/modules/workspaces/domain/types'
 import { WorkspaceTeam } from '@/modules/workspaces/domain/types'
-import { Stream, StreamWithOptionalRole } from '@/modules/core/domain/streams/types'
+import { Stream } from '@/modules/core/domain/streams/types'
 import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
 import { ServerRegion } from '@/modules/multiregion/domain/types'
 import { SetOptional } from 'type-fest'
@@ -286,18 +286,6 @@ export type ValidateWorkspaceMemberProjectRole = (params: {
 
 /** Workspace Projects */
 
-type QueryAllWorkspaceProjectsArgs = {
-  workspaceId: string
-  /**
-   * Optionally get project roles for a specific user
-   */
-  userId?: string
-}
-
-export type QueryAllWorkspaceProjects = (
-  args: QueryAllWorkspaceProjectsArgs
-) => AsyncGenerator<StreamWithOptionalRole[], void, unknown>
-
 export type GetWorkspacesProjectsCounts = (params: {
   workspaceIds: string[]
 }) => Promise<{
diff --git a/packages/server/modules/workspaces/events/eventListener.ts b/packages/server/modules/workspaces/events/eventListener.ts
index 20e814c16..4859def72 100644
--- a/packages/server/modules/workspaces/events/eventListener.ts
+++ b/packages/server/modules/workspaces/events/eventListener.ts
@@ -1,5 +1,6 @@
 import {
   getStreamFactory,
+  getStreamRolesFactory,
   getStreamsCollaboratorCountsFactory,
   grantStreamPermissionsFactory,
   legacyGetStreamsFactory,
@@ -17,7 +18,6 @@ import {
   GetWorkspaceSeatCount,
   GetWorkspaceSeatTypeToProjectRoleMapping,
   GetWorkspacesProjectsCounts,
-  QueryAllWorkspaceProjects,
   ValidateWorkspaceMemberProjectRole
 } from '@/modules/workspaces/domain/operations'
 import {
@@ -44,7 +44,10 @@ import {
   throwUncoveredError,
   WorkspaceRoles
 } from '@speckle/shared'
-import { UpsertProjectRole } from '@/modules/core/domain/projects/operations'
+import {
+  QueryAllProjects,
+  UpsertProjectRole
+} from '@/modules/core/domain/projects/operations'
 import { WorkspaceEvents } from '@/modules/workspacesCore/domain/events'
 import { Knex } from 'knex'
 import {
@@ -59,7 +62,6 @@ import {
   upsertWorkspaceRoleFactory
 } from '@/modules/workspaces/repositories/workspaces'
 import {
-  queryAllWorkspaceProjectsFactory,
   getWorkspaceRoleToDefaultProjectRoleMappingFactory,
   getWorkspaceSeatTypeToProjectRoleMappingFactory,
   validateWorkspaceMemberProjectRoleFactory
@@ -142,6 +144,7 @@ import { WorkspacePlanStatuses } from '@/modules/cross-server-sync/graph/generat
 import { GatekeeperEvents } from '@/modules/gatekeeperCore/domain/events'
 import { GetUser } from '@/modules/core/domain/users/operations'
 import { WorkspacePlans } from '@/modules/core/graph/generated/graphql'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const { FF_BILLING_INTEGRATION_ENABLED } = getFeatureFlags()
 
@@ -241,7 +244,7 @@ export const onWorkspaceAuthorizedFactory =
 
 export const onWorkspaceRoleDeletedFactory =
   (deps: {
-    queryAllWorkspaceProjects: QueryAllWorkspaceProjects
+    queryAllProjects: QueryAllProjects
     deleteWorkspaceSeat: DeleteWorkspaceSeat
     getStreamsCollaboratorCounts: GetStreamsCollaboratorCounts
     getWorkspaceCollaborators: GetWorkspaceCollaborators
@@ -269,7 +272,7 @@ export const onWorkspaceRoleDeletedFactory =
     })
 
     // Delete roles for all workspace projects
-    for await (const projectsPage of deps.queryAllWorkspaceProjects({
+    for await (const projectsPage of deps.queryAllProjects({
       workspaceId,
       userId
     })) {
@@ -322,7 +325,7 @@ export const onWorkspaceRoleDeletedFactory =
 export const onWorkspaceSeatUpdatedFactory =
   (deps: {
     getWorkspaceSeatTypeToProjectRoleMapping: GetWorkspaceSeatTypeToProjectRoleMapping
-    queryAllWorkspaceProjects: QueryAllWorkspaceProjects
+    queryAllProjects: QueryAllProjects
     setStreamCollaborator: SetStreamCollaborator
     getWorkspaceWithPlan: GetWorkspaceWithPlan
     getWorkspaceRoleForUser: GetWorkspaceRoleForUser
@@ -357,7 +360,7 @@ export const onWorkspaceSeatUpdatedFactory =
     })
 
     // Ensure project roles are valid on seat type switch
-    for await (const projectsPage of deps.queryAllWorkspaceProjects({
+    for await (const projectsPage of deps.queryAllProjects({
       workspaceId,
       userId
     })) {
@@ -409,7 +412,7 @@ export const onWorkspaceSeatUpdatedFactory =
 
 export const onWorkspaceRoleUpdatedFactory =
   (deps: {
-    queryAllWorkspaceProjects: QueryAllWorkspaceProjects
+    queryAllProjects: QueryAllProjects
     setStreamCollaborator: SetStreamCollaborator
     getWorkspaceUserSeat: GetWorkspaceUserSeat
     getStreamsCollaboratorCounts: GetStreamsCollaboratorCounts
@@ -444,7 +447,7 @@ export const onWorkspaceRoleUpdatedFactory =
     })
 
     // Enforce project roles based on workspace role and seat type, if project role exists
-    for await (const projectsPage of deps.queryAllWorkspaceProjects({
+    for await (const projectsPage of deps.queryAllProjects({
       workspaceId,
       userId
     })) {
@@ -926,9 +929,7 @@ export const initializeEventListenersFactory =
           getWorkspacePlan,
           getWorkspaceSubscription: getWorkspaceSubscriptionFactory({ db }),
           getWorkspaceModelCount: getWorkspaceModelCountFactory({
-            queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
-              getStreams
-            }),
+            queryAllProjects: queryAllProjectsFactory({ getStreams }),
             getPaginatedProjectModelsTotalCount:
               getPaginatedProjectModelsTotalCountFactory({ db })
           }),
@@ -946,9 +947,7 @@ export const initializeEventListenersFactory =
           getWorkspacePlan,
           getWorkspaceSubscription: getWorkspaceSubscriptionFactory({ db }),
           getWorkspaceModelCount: getWorkspaceModelCountFactory({
-            queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
-              getStreams
-            }),
+            queryAllProjects: queryAllProjectsFactory({ getStreams }),
             getPaginatedProjectModelsTotalCount:
               getPaginatedProjectModelsTotalCountFactory({ db })
           }),
@@ -987,9 +986,7 @@ export const initializeEventListenersFactory =
         await withTransaction(
           async ({ db: trx }) => {
             const onWorkspaceRoleDeleted = onWorkspaceRoleDeletedFactory({
-              queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
-                getStreams
-              }),
+              queryAllProjects: queryAllProjectsFactory({ getStreams }),
               deleteWorkspaceSeat: deleteWorkspaceSeatFactory({ db: trx }),
               getStreamsCollaboratorCounts: getStreamsCollaboratorCountsFactory({ db }),
               getWorkspaceCollaborators: getWorkspaceCollaboratorsFactory({ db }),
@@ -1007,7 +1004,8 @@ export const initializeEventListenersFactory =
                 }),
                 revokeStreamPermissions: revokeStreamPermissionsFactory({
                   db: trx
-                })
+                }),
+                getStreamRoles: getStreamRolesFactory({ db: trx })
               }),
               getWorkspaceUserSeat: getWorkspaceUserSeatFactory({ db }),
               emitEvent: eventBus.emit
@@ -1022,9 +1020,7 @@ export const initializeEventListenersFactory =
         await withTransaction(
           async ({ db: trx }) => {
             const onWorkspaceRoleUpdated = onWorkspaceRoleUpdatedFactory({
-              queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
-                getStreams
-              }),
+              queryAllProjects: queryAllProjectsFactory({ getStreams }),
               setStreamCollaborator: setStreamCollaboratorFactory({
                 getUser: getUserFactory({ db }),
                 validateStreamAccess: validateStreamAccessFactory({
@@ -1039,7 +1035,8 @@ export const initializeEventListenersFactory =
                 }),
                 revokeStreamPermissions: revokeStreamPermissionsFactory({
                   db: trx
-                })
+                }),
+                getStreamRoles: getStreamRolesFactory({ db: trx })
               }),
               getWorkspaceUserSeat: getWorkspaceUserSeatFactory({ db }),
               getStreamsCollaboratorCounts: getStreamsCollaboratorCountsFactory({ db }),
@@ -1065,11 +1062,10 @@ export const initializeEventListenersFactory =
                 isStreamCollaborator: isStreamCollaboratorFactory({
                   getStream: getStreamFactory({ db })
                 }),
-                revokeStreamPermissions: revokeStreamPermissionsFactory({ db: trx })
-              }),
-              queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
-                getStreams
+                revokeStreamPermissions: revokeStreamPermissionsFactory({ db: trx }),
+                getStreamRoles: getStreamRolesFactory({ db: trx })
               }),
+              queryAllProjects: queryAllProjectsFactory({ getStreams }),
               getWorkspaceWithPlan: getWorkspaceWithPlanFactory({ db }),
               getWorkspaceRoleForUser: getWorkspaceRoleForUserFactory({ db }),
               getWorkspaceSeatTypeToProjectRoleMapping:
diff --git a/packages/server/modules/workspaces/graph/resolvers/regions.ts b/packages/server/modules/workspaces/graph/resolvers/regions.ts
index 3b5047ec5..1c4d27e8a 100644
--- a/packages/server/modules/workspaces/graph/resolvers/regions.ts
+++ b/packages/server/modules/workspaces/graph/resolvers/regions.ts
@@ -20,10 +20,10 @@ import {
 import { Roles } from '@speckle/shared'
 import { WorkspacesNotYetImplementedError } from '@/modules/workspaces/errors/workspace'
 import { scheduleJob } from '@/modules/multiregion/services/queue'
-import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
 import { legacyGetStreamsFactory } from '@/modules/core/repositories/streams'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import { withOperationLogging } from '@/observability/domain/businessLogging'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const { FF_MOVE_PROJECT_REGION_ENABLED } = getFeatureFlags()
 
@@ -76,10 +76,10 @@ export default {
 
       // Move existing workspace projects to new target region
       if (FF_MOVE_PROJECT_REGION_ENABLED) {
-        const queryAllWorkspaceProjects = queryAllWorkspaceProjectsFactory({
+        const queryAllProjects = queryAllProjectsFactory({
           getStreams: legacyGetStreamsFactory({ db })
         })
-        for await (const projects of queryAllWorkspaceProjects({
+        for await (const projects of queryAllProjects({
           workspaceId
         })) {
           await Promise.all(
diff --git a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
index 53a141655..b5434d1a2 100644
--- a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
+++ b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
@@ -6,13 +6,13 @@ import {
 import { removePrivateFields } from '@/modules/core/helpers/userHelper'
 import {
   updateProjectFactory,
-  getRolesByUserIdFactory,
   getStreamFactory,
   deleteStreamFactory,
   revokeStreamPermissionsFactory,
   grantStreamPermissionsFactory,
   legacyGetStreamsFactory,
-  getStreamCollaboratorsFactory
+  getStreamCollaboratorsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { InviteCreateValidationError } from '@/modules/serverinvites/errors'
 import {
@@ -107,7 +107,6 @@ import {
   getWorkspaceRoleToDefaultProjectRoleMappingFactory,
   getWorkspaceSeatTypeToProjectRoleMappingFactory,
   moveProjectToWorkspaceFactory,
-  queryAllWorkspaceProjectsFactory,
   validateWorkspaceMemberProjectRoleFactory
 } from '@/modules/workspaces/services/projects'
 import {
@@ -194,7 +193,10 @@ import {
   updateWorkspaceJoinRequestStatusFactory
 } from '@/modules/workspaces/repositories/workspaceJoinRequests'
 import { sendWorkspaceJoinRequestReceivedEmailFactory } from '@/modules/workspaces/services/workspaceJoinRequestEmails/received'
-import { getProjectFactory } from '@/modules/core/repositories/projects'
+import {
+  getProjectFactory,
+  getUserProjectRolesFactory
+} from '@/modules/core/repositories/projects'
 import { getProjectRegionKey } from '@/modules/multiregion/utils/regionSelector'
 import { scheduleJob } from '@/modules/multiregion/services/queue'
 import { updateWorkspacePlanFactory } from '@/modules/gatekeeper/services/workspacePlans'
@@ -228,6 +230,7 @@ import {
 } from '@/modules/serverinvites/services/coreFinalization'
 import { WorkspaceInvitesLimit } from '@/modules/workspaces/domain/constants'
 import { copyWorkspaceFactory } from '@/modules/workspaces/repositories/projectRegions'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const eventBus = getEventBus()
 const getServerInfo = getServerInfoFactory({ db })
@@ -331,6 +334,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -406,6 +410,7 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 const updateStreamRoleAndNotify = updateStreamRoleAndNotifyFactory({
@@ -769,7 +774,7 @@ export = FF_WORKSPACES_MODULE_ENABLED
               deleteWorkspace: repoDeleteWorkspaceFactory({ db }),
               deleteProject: deleteStreamFactory({ db }),
               deleteAllResourceInvites: deleteAllResourceInvitesFactory({ db }),
-              queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
+              queryAllProjects: queryAllProjectsFactory({
                 getStreams: legacyGetStreamsFactory({ db })
               }),
               deleteSsoProvider: deleteSsoProviderFactory({ db }),
@@ -1849,7 +1854,7 @@ export = FF_WORKSPACES_MODULE_ENABLED
           return parent.workspaceRoleCreatedAt
         },
         projectRoles: async (parent) => {
-          const projectRoles = await getRolesByUserIdFactory({ db })({
+          const projectRoles = await getUserProjectRolesFactory({ db })({
             userId: parent.id,
             workspaceId: parent.workspaceId
           })
diff --git a/packages/server/modules/workspaces/index.ts b/packages/server/modules/workspaces/index.ts
index 4024f6b79..bf3ccab9c 100644
--- a/packages/server/modules/workspaces/index.ts
+++ b/packages/server/modules/workspaces/index.ts
@@ -19,7 +19,6 @@ import {
 } from '@/modules/core/repositories/scheduledTasks'
 import { getWorkspacesNonCompleteFactory } from '@/modules/workspaces/repositories/workspaces'
 import { deleteWorkspacesNonCompleteFactory } from '@/modules/workspaces/services/workspaceCreationState'
-import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
 import {
   deleteStreamFactory,
   legacyGetStreamsFactory
@@ -31,6 +30,7 @@ import { deleteWorkspaceFactory as repoDeleteWorkspaceFactory } from '@/modules/
 import { deleteWorkspaceFactory } from '@/modules/workspaces/services/management'
 import { scheduleUpdateAllWorkspacesTracking } from '@/modules/workspaces/services/tracking'
 import { getClient } from '@/modules/shared/utils/mixpanel'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const {
   FF_WORKSPACES_MODULE_ENABLED,
@@ -62,7 +62,7 @@ const scheduleDeleteWorkspacesNonComplete = ({
       deleteWorkspace: repoDeleteWorkspaceFactory({ db }),
       deleteProject: deleteStreamFactory({ db }),
       deleteAllResourceInvites: deleteAllResourceInvitesFactory({ db }),
-      queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
+      queryAllProjects: queryAllProjectsFactory({
         getStreams: legacyGetStreamsFactory({ db })
       }),
       deleteSsoProvider: deleteSsoProviderFactory({ db }),
diff --git a/packages/server/modules/workspaces/services/management.ts b/packages/server/modules/workspaces/services/management.ts
index 0b9d2ffb3..51578d365 100644
--- a/packages/server/modules/workspaces/services/management.ts
+++ b/packages/server/modules/workspaces/services/management.ts
@@ -4,7 +4,6 @@ import {
   EmitWorkspaceEvent,
   GetWorkspace,
   StoreWorkspaceDomain,
-  QueryAllWorkspaceProjects,
   UpsertWorkspace,
   UpsertWorkspaceRole,
   GetWorkspaceWithDomains,
@@ -70,6 +69,7 @@ import {
   DeleteSsoProvider,
   GetWorkspaceSsoProviderRecord
 } from '@/modules/workspaces/domain/sso/operations'
+import { QueryAllProjects } from '@/modules/core/domain/projects/operations'
 
 type WorkspaceCreateArgs = {
   userId: string
@@ -295,14 +295,14 @@ export const deleteWorkspaceFactory =
   ({
     deleteWorkspace,
     deleteProject,
-    queryAllWorkspaceProjects,
+    queryAllProjects,
     deleteAllResourceInvites,
     deleteSsoProvider,
     emitWorkspaceEvent
   }: {
     deleteWorkspace: DeleteWorkspace
     deleteProject: DeleteStreamRecord
-    queryAllWorkspaceProjects: QueryAllWorkspaceProjects
+    queryAllProjects: QueryAllProjects
     deleteAllResourceInvites: DeleteAllResourceInvites
     deleteSsoProvider: DeleteSsoProvider
     emitWorkspaceEvent: EventBus['emit']
@@ -313,7 +313,7 @@ export const deleteWorkspaceFactory =
 
     // Cache project ids for post-workspace-delete cleanup
     const projectIds: string[] = []
-    for await (const projects of queryAllWorkspaceProjects({ workspaceId })) {
+    for await (const projects of queryAllProjects({ workspaceId })) {
       projectIds.push(...projects.map((project) => project.id))
     }
 
diff --git a/packages/server/modules/workspaces/services/projects.ts b/packages/server/modules/workspaces/services/projects.ts
index 332a43f0f..e032197c0 100644
--- a/packages/server/modules/workspaces/services/projects.ts
+++ b/packages/server/modules/workspaces/services/projects.ts
@@ -5,7 +5,6 @@ import {
   GetWorkspaceRoleToDefaultProjectRoleMapping,
   GetWorkspaceSeatTypeToProjectRoleMapping,
   IntersectProjectCollaboratorsAndWorkspaceCollaborators,
-  QueryAllWorkspaceProjects,
   AddOrUpdateWorkspaceRole,
   ValidateWorkspaceMemberProjectRole,
   CopyWorkspace
@@ -13,15 +12,13 @@ import {
 import {
   WorkspaceInvalidProjectError,
   WorkspaceInvalidRoleError,
-  WorkspaceNotFoundError,
-  WorkspaceQueryError
+  WorkspaceNotFoundError
 } from '@/modules/workspaces/errors/workspace'
 import { GetProject, UpdateProject } from '@/modules/core/domain/projects/operations'
 import { chunk } from 'lodash'
 import { Roles, WorkspaceRoles } from '@speckle/shared'
 import {
   GetStreamCollaborators,
-  LegacyGetStreams,
   UpdateStreamRole
 } from '@/modules/core/domain/streams/operations'
 import { ProjectNotFoundError } from '@/modules/core/errors/projects'
@@ -58,39 +55,6 @@ import { userEmailsCompliantWithWorkspaceDomains } from '@/modules/workspaces/do
 import { CreateWorkspaceSeat } from '@/modules/gatekeeper/domain/operations'
 import { WorkspaceAcl } from '@/modules/workspacesCore/domain/types'
 
-export const queryAllWorkspaceProjectsFactory = ({
-  getStreams
-}: {
-  getStreams: LegacyGetStreams
-}): QueryAllWorkspaceProjects =>
-  async function* queryAllWorkspaceProjects({
-    workspaceId,
-    userId
-  }): AsyncGenerator<StreamRecord[], void, unknown> {
-    let cursor: Date | null = null
-    let iterationCount = 0
-
-    do {
-      if (iterationCount > 500) throw new WorkspaceQueryError()
-
-      const { streams, cursorDate } = await getStreams({
-        cursor,
-        orderBy: null,
-        limit: 100,
-        visibility: null,
-        searchQuery: null,
-        streamIdWhitelist: null,
-        workspaceIdWhitelist: [workspaceId],
-        userId
-      })
-
-      yield streams
-
-      cursor = cursorDate
-      iterationCount++
-    } while (!!cursor)
-  }
-
 type MoveProjectToWorkspaceArgs = {
   projectId: string
   workspaceId: string
diff --git a/packages/server/modules/workspaces/services/tracking.ts b/packages/server/modules/workspaces/services/tracking.ts
index cc200f27b..0931cf727 100644
--- a/packages/server/modules/workspaces/services/tracking.ts
+++ b/packages/server/modules/workspaces/services/tracking.ts
@@ -33,9 +33,9 @@ import {
 } from '@/modules/gatekeeper/repositories/billing'
 import { db } from '@/db/knex'
 import { getPaginatedProjectModelsTotalCountFactory } from '@/modules/core/repositories/branches'
-import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
 import { getWorkspaceModelCountFactory } from '@/modules/workspaces/services/workspaceLimits'
 import { legacyGetStreamsFactory } from '@/modules/core/repositories/streams'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 export type WorkspaceTrackingProperties = {
   name: string
@@ -215,7 +215,7 @@ export const scheduleUpdateAllWorkspacesTracking = ({
       getWorkspacePlan: getWorkspacePlanFactory({ db }),
       getWorkspaceSubscription: getWorkspaceSubscriptionFactory({ db }),
       getWorkspaceModelCount: getWorkspaceModelCountFactory({
-        queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
+        queryAllProjects: queryAllProjectsFactory({
           getStreams: legacyGetStreamsFactory({ db })
         }),
         getPaginatedProjectModelsTotalCount: getPaginatedProjectModelsTotalCountFactory(
diff --git a/packages/server/modules/workspaces/services/workspaceLimits.ts b/packages/server/modules/workspaces/services/workspaceLimits.ts
index f89cda3ce..380b3b98f 100644
--- a/packages/server/modules/workspaces/services/workspaceLimits.ts
+++ b/packages/server/modules/workspaces/services/workspaceLimits.ts
@@ -1,19 +1,17 @@
 import { GetPaginatedProjectModelsTotalCount } from '@/modules/core/domain/branches/operations'
-import {
-  GetWorkspaceModelCount,
-  QueryAllWorkspaceProjects
-} from '@/modules/workspaces/domain/operations'
+import { QueryAllProjects } from '@/modules/core/domain/projects/operations'
+import { GetWorkspaceModelCount } from '@/modules/workspaces/domain/operations'
 
 // TODO: Optimize with single model count query per regional db
 export const getWorkspaceModelCountFactory =
   (deps: {
-    queryAllWorkspaceProjects: QueryAllWorkspaceProjects
+    queryAllProjects: QueryAllProjects
     getPaginatedProjectModelsTotalCount: GetPaginatedProjectModelsTotalCount
   }): GetWorkspaceModelCount =>
   async ({ workspaceId }) => {
     let modelCount = 0
 
-    for await (const projects of deps.queryAllWorkspaceProjects({ workspaceId })) {
+    for await (const projects of deps.queryAllProjects({ workspaceId })) {
       for (const project of projects) {
         modelCount =
           modelCount + (await deps.getPaginatedProjectModelsTotalCount(project.id, {}))
diff --git a/packages/server/modules/workspaces/tests/helpers/creation.ts b/packages/server/modules/workspaces/tests/helpers/creation.ts
index 03d8c1820..88205349f 100644
--- a/packages/server/modules/workspaces/tests/helpers/creation.ts
+++ b/packages/server/modules/workspaces/tests/helpers/creation.ts
@@ -59,6 +59,7 @@ import {
 } from '@speckle/shared'
 import {
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
@@ -594,6 +595,7 @@ export const createWorkspaceInviteDirectly = async (
             validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
             getUser: getUserFactory({ db }),
             grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+            getStreamRoles: getStreamRolesFactory({ db }),
             emitEvent: getEventBus().emit
           })
         })
diff --git a/packages/server/modules/workspaces/tests/integration/invites.graph.spec.ts b/packages/server/modules/workspaces/tests/integration/invites.graph.spec.ts
index d2377b996..d67be1ae9 100644
--- a/packages/server/modules/workspaces/tests/integration/invites.graph.spec.ts
+++ b/packages/server/modules/workspaces/tests/integration/invites.graph.spec.ts
@@ -54,7 +54,10 @@ import {
   WorkspaceProtectedError
 } from '@/modules/workspaces/errors/workspace'
 import cryptoRandomString from 'crypto-random-string'
-import { grantStreamPermissionsFactory } from '@/modules/core/repositories/streams'
+import {
+  getStreamRolesFactory,
+  grantStreamPermissionsFactory
+} from '@/modules/core/repositories/streams'
 import {
   addOrUpdateStreamCollaboratorFactory,
   validateStreamAccessFactory
@@ -84,6 +87,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
diff --git a/packages/server/modules/workspaces/tests/integration/projects.graph.spec.ts b/packages/server/modules/workspaces/tests/integration/projects.graph.spec.ts
index ea74c0da7..a1a7d198c 100644
--- a/packages/server/modules/workspaces/tests/integration/projects.graph.spec.ts
+++ b/packages/server/modules/workspaces/tests/integration/projects.graph.spec.ts
@@ -1,9 +1,15 @@
 import { db } from '@/db/knex'
-import { StreamAcl } from '@/modules/core/dbSchema'
-import { ProjectRecordVisibility } from '@/modules/core/helpers/types'
+import { StreamAcl, Streams } from '@/modules/core/dbSchema'
+import { ProjectRecordVisibility, StreamRecord } from '@/modules/core/helpers/types'
+import {
+  deleteProjectFactory,
+  getProjectFactory
+} from '@/modules/core/repositories/projects'
 import { grantStreamPermissionsFactory } from '@/modules/core/repositories/streams'
+import { waitForRegionProjectFactory } from '@/modules/core/services/projects'
 import { WorkspaceSeatType } from '@/modules/gatekeeper/domain/billing'
 import { getWorkspaceUserSeatsFactory } from '@/modules/gatekeeper/repositories/workspaceSeat'
+import { getRegionDb } from '@/modules/multiregion/utils/dbSelector'
 import { WorkspaceInvalidRoleError } from '@/modules/workspaces/errors/workspace'
 import {
   assignToWorkspace,
@@ -59,11 +65,16 @@ import {
 import { expect } from 'chai'
 import cryptoRandomString from 'crypto-random-string'
 import dayjs from 'dayjs'
+import { Knex } from 'knex'
 import { times } from 'lodash'
 
 const grantStreamPermissions = grantStreamPermissionsFactory({ db })
 const adminOverrideMock = mockAdminOverride()
 
+const tables = {
+  streams: (db: Knex) => db.table<StreamRecord>(Streams.name)
+}
+
 describe('Workspace project GQL CRUD', () => {
   let apollo: TestApolloServer
 
@@ -862,8 +873,7 @@ describe('Workspace project GQL CRUD', () => {
       id: '',
       ownerId: '',
       name: 'Test Project',
-      visibility: ProjectRecordVisibility.Private,
-      regionKey: isMultiRegionTestMode() ? 'region1' : undefined
+      visibility: ProjectRecordVisibility.Private
     }
 
     const targetWorkspace: BasicTestWorkspace = {
@@ -986,26 +996,61 @@ describe('Workspace project GQL CRUD', () => {
       expect(adminWorkspaceRole?.role).to.equal(Roles.Workspace.Admin)
     })
 
-    it('should respect project region during move mutations @multiregion', async () => {
-      const resA = await apollo.execute(MoveProjectToWorkspaceDocument, {
-        projectId: testProject.id,
-        workspaceId: targetWorkspace.id
-      })
-      const resB = await apollo.execute(UpdateProjectDocument, {
-        input: {
-          id: testProject.id,
-          name: 'Foo'
-        }
-      })
-      const resC = await apollo.execute(GetProjectDocument, {
-        id: testProject.id
-      })
+    isMultiRegionTestMode()
+      ? describe('when the default server db region is not the main db', () => {
+          const regionalProject: StreamRecord = {
+            id: cryptoRandomString({ length: 9 }),
+            name: 'My Special Project',
+            description: null,
+            clonedFrom: null,
+            createdAt: new Date(),
+            updatedAt: new Date(),
+            allowPublicComments: false,
+            workspaceId: null,
+            regionKey: 'region1',
+            visibility: ProjectRecordVisibility.Public
+          }
 
-      expect(resA).to.not.haveGraphQLErrors()
-      expect(resB).to.not.haveGraphQLErrors()
-      expect(resC).to.not.haveGraphQLErrors()
-      expect(resC.data?.project?.workspaceId).to.equal(targetWorkspace.id)
-    })
+          beforeEach(async () => {
+            // Simulate non-main default db region
+            const regionDb = await getRegionDb({ regionKey: 'region1' })
+            await tables.streams(regionDb).insert(regionalProject)
+            await waitForRegionProjectFactory({
+              getProject: getProjectFactory({ db }),
+              deleteProject: deleteProjectFactory({ db: regionDb })
+            })({
+              projectId: regionalProject.id,
+              regionKey: 'region1'
+            })
+            await grantStreamPermissions({
+              streamId: regionalProject.id,
+              userId: serverAdminUser.id,
+              role: Roles.Stream.Owner
+            })
+          })
+
+          it('should update project without removing workspace association @multiregion', async () => {
+            const resA = await apollo.execute(MoveProjectToWorkspaceDocument, {
+              projectId: regionalProject.id,
+              workspaceId: targetWorkspace.id
+            })
+            const resB = await apollo.execute(UpdateProjectDocument, {
+              input: {
+                id: regionalProject.id,
+                name: 'Foo'
+              }
+            })
+            const resC = await apollo.execute(GetProjectDocument, {
+              id: regionalProject.id
+            })
+
+            expect(resA).to.not.haveGraphQLErrors()
+            expect(resB).to.not.haveGraphQLErrors()
+            expect(resC).to.not.haveGraphQLErrors()
+            expect(resC.data?.project?.workspaceId).to.equal(targetWorkspace.id)
+          })
+        })
+      : null
   })
 
   // moved over Alessandro's tests from core to here, since they are all related to workspaces
diff --git a/packages/server/modules/workspaces/tests/integration/tracking.spec.ts b/packages/server/modules/workspaces/tests/integration/tracking.spec.ts
index 635796c7c..affcb3516 100644
--- a/packages/server/modules/workspaces/tests/integration/tracking.spec.ts
+++ b/packages/server/modules/workspaces/tests/integration/tracking.spec.ts
@@ -16,7 +16,6 @@ import {
   getWorkspaceSubscriptionFactory
 } from '@/modules/gatekeeper/repositories/billing'
 import { getWorkspaceModelCountFactory } from '@/modules/workspaces/services/workspaceLimits'
-import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
 import { legacyGetStreamsFactory } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
 import { getPaginatedProjectModelsTotalCountFactory } from '@/modules/core/repositories/branches'
@@ -26,6 +25,7 @@ import { buildMixpanelFake } from '@/modules/shared/test/helpers/mixpanel'
 import { expect } from 'chai'
 import { truncateTables } from '@/test/hooks'
 import { Workspaces } from '@/modules/workspaces/helpers/db'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 describe('Tracking Workspaces', () => {
   const testUser: BasicTestUser = {
@@ -41,7 +41,7 @@ describe('Tracking Workspaces', () => {
       getWorkspacePlan: getWorkspacePlanFactory({ db }),
       getWorkspaceSubscription: getWorkspaceSubscriptionFactory({ db }),
       getWorkspaceModelCount: getWorkspaceModelCountFactory({
-        queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
+        queryAllProjects: queryAllProjectsFactory({
           getStreams: legacyGetStreamsFactory({ db })
         }),
         getPaginatedProjectModelsTotalCount: getPaginatedProjectModelsTotalCountFactory(
diff --git a/packages/server/modules/workspaces/tests/integration/workspacesCreationState.spec.ts b/packages/server/modules/workspaces/tests/integration/workspacesCreationState.spec.ts
index a72231fa1..44647cc14 100644
--- a/packages/server/modules/workspaces/tests/integration/workspacesCreationState.spec.ts
+++ b/packages/server/modules/workspaces/tests/integration/workspacesCreationState.spec.ts
@@ -14,7 +14,6 @@ import { expect } from 'chai'
 import dayjs from 'dayjs'
 import { deleteWorkspacesNonCompleteFactory } from '@/modules/workspaces/services/workspaceCreationState'
 import { logger } from '@/observability/logging'
-import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
 import {
   deleteStreamFactory,
   legacyGetStreamsFactory
@@ -24,6 +23,7 @@ import { getEventBus } from '@/modules/shared/services/eventBus'
 import { deleteAllResourceInvitesFactory } from '@/modules/serverinvites/repositories/serverInvites'
 import { deleteWorkspaceFactory as repoDeleteWorkspaceFactory } from '@/modules/workspaces/repositories/workspaces'
 import { deleteWorkspaceFactory } from '@/modules/workspaces/services/management'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 
 const updateAWorkspaceCreatedAt = async (
   workspaceId: string,
@@ -44,7 +44,7 @@ describe('WorkspaceCreationState services', () => {
       deleteWorkspace: repoDeleteWorkspaceFactory({ db }),
       deleteProject: deleteStreamFactory({ db }),
       deleteAllResourceInvites: deleteAllResourceInvitesFactory({ db }),
-      queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({
+      queryAllProjects: queryAllProjectsFactory({
         getStreams: legacyGetStreamsFactory({ db })
       }),
       deleteSsoProvider: deleteSsoProviderFactory({ db }),
diff --git a/packages/server/modules/workspaces/tests/unit/services/projects.spec.ts b/packages/server/modules/workspaces/tests/unit/services/projects.spec.ts
index 7e0896778..ebfe2d2cf 100644
--- a/packages/server/modules/workspaces/tests/unit/services/projects.spec.ts
+++ b/packages/server/modules/workspaces/tests/unit/services/projects.spec.ts
@@ -1,12 +1,10 @@
 import { ProjectTeamMember } from '@/modules/core/domain/projects/types'
 import { ProjectNotFoundError } from '@/modules/core/errors/projects'
 import { StreamRecord } from '@/modules/core/helpers/types'
+import { queryAllProjectsFactory } from '@/modules/core/services/projects'
 import { WorkspaceSeat, WorkspaceSeatType } from '@/modules/gatekeeper/domain/billing'
 import { WorkspaceInvalidProjectError } from '@/modules/workspaces/errors/workspace'
-import {
-  moveProjectToWorkspaceFactory,
-  queryAllWorkspaceProjectsFactory
-} from '@/modules/workspaces/services/projects'
+import { moveProjectToWorkspaceFactory } from '@/modules/workspaces/services/projects'
 import {
   Workspace,
   WorkspaceAcl,
@@ -26,7 +24,7 @@ describe('Project retrieval services', () => {
       const foundProjects: StreamRecord[] = []
       const storedProjects: StreamRecord[] = [{ workspaceId } as StreamRecord]
 
-      const queryAllWorkspaceProjectsGenerator = queryAllWorkspaceProjectsFactory({
+      const queryAllWorkspaceProjectsGenerator = queryAllProjectsFactory({
         getStreams: async () => {
           return {
             streams: storedProjects,
@@ -53,7 +51,7 @@ describe('Project retrieval services', () => {
         { workspaceId } as StreamRecord
       ]
 
-      const queryAllWorkspaceProjectsGenerator = queryAllWorkspaceProjectsFactory({
+      const queryAllWorkspaceProjectsGenerator = queryAllProjectsFactory({
         getStreams: async ({ cursor }) => {
           return cursor
             ? { streams: [storedProjects[1]], totalCount: 1, cursorDate: null }
@@ -74,7 +72,7 @@ describe('Project retrieval services', () => {
 
       const foundProjects: StreamRecord[] = []
 
-      const queryAllWorkspaceProjectsGenerator = queryAllWorkspaceProjectsFactory({
+      const queryAllWorkspaceProjectsGenerator = queryAllProjectsFactory({
         getStreams: async () => {
           return { streams: [], totalCount: 0, cursorDate: null }
         }
diff --git a/packages/server/modules/workspacesCore/domain/operations.ts b/packages/server/modules/workspacesCore/domain/operations.ts
index 2d6b104f0..83849718b 100644
--- a/packages/server/modules/workspacesCore/domain/operations.ts
+++ b/packages/server/modules/workspacesCore/domain/operations.ts
@@ -27,4 +27,8 @@ export type GetUserWorkspaceCountFactory = (params: {
   userId: string
 }) => Promise<number>
 
+export type GetUserWorkspaceSeatsFactory = (params: {
+  userId: string
+}) => Promise<WorkspaceSeat[]>
+
 export type GetTotalWorkspaceCountFactory = () => Promise<number>
diff --git a/packages/server/modules/workspacesCore/repositories/workspaces.ts b/packages/server/modules/workspacesCore/repositories/workspaces.ts
index 8553854df..5b6eb01b0 100644
--- a/packages/server/modules/workspacesCore/repositories/workspaces.ts
+++ b/packages/server/modules/workspacesCore/repositories/workspaces.ts
@@ -1,17 +1,24 @@
 import {
   GetTotalWorkspaceCountFactory,
-  GetUserWorkspaceCountFactory
+  GetUserWorkspaceCountFactory,
+  GetUserWorkspaceSeatsFactory
 } from '@/modules/workspacesCore/domain/operations'
-import { Workspace, WorkspaceAcl } from '@/modules/workspacesCore/domain/types'
+import {
+  Workspace,
+  WorkspaceAcl,
+  WorkspaceSeat
+} from '@/modules/workspacesCore/domain/types'
 import {
   WorkspaceAcl as WorkspaceAclDb,
-  Workspaces
+  Workspaces,
+  WorkspaceSeats
 } from '@/modules/workspacesCore/helpers/db'
 import { Knex } from 'knex'
 
 const tables = {
   workspaces: (db: Knex) => db<Workspace>(Workspaces.name),
-  workspaceAcl: (db: Knex) => db<WorkspaceAcl>(WorkspaceAclDb.name)
+  workspaceAcl: (db: Knex) => db<WorkspaceAcl>(WorkspaceAclDb.name),
+  workspaceSeats: (db: Knex) => db<WorkspaceSeat>(WorkspaceSeats.name)
 }
 
 export const getUserWorkspaceCountFactory =
@@ -27,6 +34,14 @@ export const getUserWorkspaceCountFactory =
     return parseInt(count)
   }
 
+export const getUserWorkspaceSeatsFactory =
+  (deps: { db: Knex }): GetUserWorkspaceSeatsFactory =>
+  async ({ userId }: { userId: string }) => {
+    const workspaceSeats = await tables.workspaceSeats(deps.db).where({ userId })
+
+    return workspaceSeats
+  }
+
 export const getTotalWorkspaceCountFactory =
   (deps: { db: Knex }): GetTotalWorkspaceCountFactory =>
   async () => {
diff --git a/packages/server/scripts/streamObjects.ts b/packages/server/scripts/streamObjects.ts
index ca15761a1..1ee79c437 100644
--- a/packages/server/scripts/streamObjects.ts
+++ b/packages/server/scripts/streamObjects.ts
@@ -9,7 +9,8 @@ import { Scopes } from '@speckle/shared'
 import {
   getStreamFactory,
   createStreamFactory,
-  grantStreamPermissionsFactory
+  grantStreamPermissionsFactory,
+  getStreamRolesFactory
 } from '@/modules/core/repositories/streams'
 import { db } from '@/db/knex'
 import {
@@ -84,6 +85,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/test/projectHelper.ts b/packages/server/test/projectHelper.ts
index 56a52d322..63990ac5c 100644
--- a/packages/server/test/projectHelper.ts
+++ b/packages/server/test/projectHelper.ts
@@ -16,6 +16,7 @@ import { getEventBus } from '@/modules/shared/services/eventBus'
 import {
   createStreamFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import { createBranchFactory } from '@/modules/core/repositories/branches'
@@ -62,6 +63,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/test/speckle-helpers/inviteHelper.ts b/packages/server/test/speckle-helpers/inviteHelper.ts
index 07115600a..815e98d9a 100644
--- a/packages/server/test/speckle-helpers/inviteHelper.ts
+++ b/packages/server/test/speckle-helpers/inviteHelper.ts
@@ -31,6 +31,7 @@ import {
 import { EmailSendingServiceMock } from '@/test/mocks/global'
 import {
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
@@ -74,6 +75,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
diff --git a/packages/server/test/speckle-helpers/streamHelper.ts b/packages/server/test/speckle-helpers/streamHelper.ts
index a14967179..fe4d10533 100644
--- a/packages/server/test/speckle-helpers/streamHelper.ts
+++ b/packages/server/test/speckle-helpers/streamHelper.ts
@@ -1,16 +1,14 @@
 import { db } from '@/db/knex'
 import { StreamAcl } from '@/modules/core/dbSchema'
-import { RegionalProjectCreationError } from '@/modules/core/errors/projects'
-import { StreamNotFoundError } from '@/modules/core/errors/stream'
 import { mapDbToGqlProjectVisibility } from '@/modules/core/helpers/project'
 import { StreamAclRecord, StreamRecord } from '@/modules/core/helpers/types'
 import { createBranchFactory } from '@/modules/core/repositories/branches'
-import { getProjectFactory } from '@/modules/core/repositories/projects'
 import { getServerInfoFactory } from '@/modules/core/repositories/server'
 import {
   createStreamFactory,
   getStreamCollaboratorsFactory,
   getStreamFactory,
+  getStreamRolesFactory,
   grantStreamPermissionsFactory,
   revokeStreamPermissionsFactory
 } from '@/modules/core/repositories/streams'
@@ -35,7 +33,6 @@ import { deleteOldAndInsertNewVerificationFactory } from '@/modules/emails/repos
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { sendEmail } from '@/modules/emails/services/sending'
 import { requestNewEmailVerificationFactory } from '@/modules/emails/services/verification/request'
-import { getRegionDb } from '@/modules/multiregion/utils/dbSelector'
 import {
   deleteInvitesByTargetFactory,
   deleteServerOnlyInvitesFactory,
@@ -57,7 +54,6 @@ import {
 } from '@/modules/serverinvites/services/processing'
 import { inviteUsersToProjectFactory } from '@/modules/serverinvites/services/projectInviteManagement'
 import { authorizeResolver } from '@/modules/shared'
-import { isTestEnv } from '@/modules/shared/helpers/envHelper'
 import { Nullable } from '@/modules/shared/helpers/typeHelper'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { getDefaultRegionFactory } from '@/modules/workspaces/repositories/regions'
@@ -65,8 +61,7 @@ import { createWorkspaceProjectFactory } from '@/modules/workspaces/services/pro
 import { BasicTestUser } from '@/test/authHelper'
 import { ProjectVisibility } from '@/test/graphql/generated/graphql'
 import { faker } from '@faker-js/faker'
-import { retry } from '@lifeomic/attempt'
-import { ensureError, Roles, StreamRoles, TIME_MS } from '@speckle/shared'
+import { ensureError, Roles, StreamRoles } from '@speckle/shared'
 import { omit } from 'lodash'
 
 const getServerInfo = getServerInfoFactory({ db })
@@ -86,6 +81,7 @@ const buildFinalizeProjectInvite = () =>
         validateStreamAccess: validateStreamAccessFactory({ authorizeResolver }),
         getUser,
         grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+        getStreamRoles: getStreamRolesFactory({ db }),
         emitEvent: getEventBus().emit
       })
     }),
@@ -156,6 +152,7 @@ const removeStreamCollaborator = removeStreamCollaboratorFactory({
   validateStreamAccess,
   isStreamCollaborator,
   revokeStreamPermissions: revokeStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -163,6 +160,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
+  getStreamRoles: getStreamRolesFactory({ db }),
   emitEvent: getEventBus().emit
 })
 
@@ -221,45 +219,11 @@ export async function createTestStream(
     })
     id = newProject.id
   } else {
-    // Create personal project
-    if (streamObj.regionKey) {
-      const regionDb = await getRegionDb({ regionKey: streamObj.regionKey })
-      const project = await createStreamFactory({ db: regionDb })({
-        ...omit(streamObj, ['id', 'ownerId', 'visibility']),
-        isPublic: visibility === ProjectVisibility.Public
-      })
-      try {
-        await retry(
-          async () => {
-            const replicatedProject = await getProjectFactory({
-              db
-            })({ projectId: project.id })
-            if (!replicatedProject) throw new StreamNotFoundError()
-          },
-          { maxAttempts: 10, delay: isTestEnv() ? TIME_MS.second : undefined }
-        )
-      } catch (err) {
-        if (err instanceof StreamNotFoundError) {
-          throw new RegionalProjectCreationError(undefined, {
-            info: { projectId: project.id, regionKey: streamObj.regionKey }
-          })
-        }
-        // else throw as is
-        throw err
-      }
-      await grantStreamPermissionsFactory({ db })({
-        streamId: project.id,
-        userId: owner.id,
-        role: Roles.Stream.Owner
-      })
-      id = project.id
-    } else {
-      id = await createStream({
-        ...omit(streamObj, ['id', 'ownerId', 'visibility']),
-        isPublic: visibility === ProjectVisibility.Public,
-        ownerId: owner.id
-      })
-    }
+    id = await createStream({
+      ...omit(streamObj, ['id', 'ownerId', 'visibility']),
+      isPublic: visibility === ProjectVisibility.Public,
+      ownerId: owner.id
+    })
   }
 
   streamObj.id = id