diff --git a/packages/frontend-2/components/viewer/gendo/Dialog.vue b/packages/frontend-2/components/viewer/gendo/Dialog.vue
index 7175b47f8a..758e2bea0a 100644
--- a/packages/frontend-2/components/viewer/gendo/Dialog.vue
+++ b/packages/frontend-2/components/viewer/gendo/Dialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <LayoutDialog v-model:open="isOpen" max-width="xl" is-transparent>
+  <LayoutDialog v-model:open="isOpen" max-width="xl" is-transparent hide-closer>
     <div class="relative flex flex-col items-center justify-center gap-2 w-full h-full">
       <!-- Fullscreen button behind image to handle background clicks -->
       <!-- that are still inside dialog and show loading state -->
@@ -9,11 +9,13 @@
       >
         <CommonLoadingIcon />
       </button>
-      <NuxtImg
-        :src="renderUrl"
-        :alt="renderPrompt"
-        class="relative z-10 w-full h-full max-h-[70vh] max-w-[80vw] object-contain"
-      />
+      <div class="w-full h-full min-h-96">
+        <NuxtImg
+          :src="renderUrl"
+          :alt="renderPrompt"
+          class="relative z-10 w-full h-full max-h-[70vh] max-w-[80vw] object-contain"
+        />
+      </div>
       <div class="relative z-10 flex gap-2">
         <FormButton
           :to="renderUrl"
diff --git a/packages/frontend-2/components/viewer/gendo/Item.vue b/packages/frontend-2/components/viewer/gendo/Item.vue
index 7b2d1287e0..a0a17b54e0 100644
--- a/packages/frontend-2/components/viewer/gendo/Item.vue
+++ b/packages/frontend-2/components/viewer/gendo/Item.vue
@@ -1,8 +1,11 @@
 <template>
-  <div v-if="detailedRender" class="mb-2">
+  <div v-if="detailedRender">
     <div class="relative">
       <div v-if="detailedRender.status === 'COMPLETED' && renderUrl" class="group">
-        <button class="relative flex cursor-zoom-in" @click="openPreview">
+        <button
+          class="relative flex cursor-zoom-in w-full aspect-video"
+          @click="openPreview"
+        >
           <div
             class="absolute inset-0 bg-highlight-3 flex items-center justify-center rounded-lg"
           >
@@ -15,7 +18,7 @@
           />
         </button>
         <div class="hidden group-hover:flex absolute top-2 left-2 gap-1 z-10">
-          <div v-tippy="`Set view`">
+          <div v-tippy="`Reset view`">
             <FormButton
               :icon-left="VideoCameraIcon"
               hide-text
@@ -23,7 +26,7 @@
               size="sm"
               @click="setView()"
             >
-              Set View
+              Reset View
             </FormButton>
           </div>
           <div v-tippy="`Copy prompt`">
@@ -66,7 +69,7 @@
         <ExclamationCircleIcon v-else class="w-6 text-danger" />
       </div>
       <div
-        class="absolute bottom-2 left-0 gap-x-2 px-2 flex items-center min-w-0 max-w-full overflow-hidden z-10"
+        class="absolute bottom-0 left-0 gap-x-2 p-2 flex items-center min-w-0 max-w-full overflow-hidden z-10"
       >
         <div
           class="bg-foundation p-0.5 flex items-center gap-x-1 min-w-0 max-w-full rounded-md"
diff --git a/packages/frontend-2/components/viewer/gendo/List.vue b/packages/frontend-2/components/viewer/gendo/List.vue
index 821619476e..f5d19f6032 100644
--- a/packages/frontend-2/components/viewer/gendo/List.vue
+++ b/packages/frontend-2/components/viewer/gendo/List.vue
@@ -1,6 +1,7 @@
 <template>
   <div
-    class="flex flex-col gap-y-2 max-h-64 2xl:max-h-96 overflow-y-auto overflow-x-hidden simple-scrollbar"
+    v-if="renders.length"
+    class="flex flex-col gap-y-2 max-h-[calc(100dvh-22rem)] overflow-y-auto overflow-x-hidden simple-scrollbar mb-3"
   >
     <ViewerGendoItem
       v-for="render in renders"
@@ -9,6 +10,7 @@
       @reuse-prompt="$emit('reuse-prompt', $event)"
     />
   </div>
+  <div v-else />
 </template>
 <script setup lang="ts">
 import { useQuery, useSubscription } from '@vue/apollo-composable'
diff --git a/packages/frontend-2/components/viewer/gendo/Panel.vue b/packages/frontend-2/components/viewer/gendo/Panel.vue
index d007f5d95b..a19c388f5b 100644
--- a/packages/frontend-2/components/viewer/gendo/Panel.vue
+++ b/packages/frontend-2/components/viewer/gendo/Panel.vue
@@ -20,6 +20,9 @@
         <CommonAlert v-if="!limits" color="danger" size="xs">
           <template #title>No credits available</template>
         </CommonAlert>
+        <CommonAlert v-else-if="isOutOfCredits" color="neutral" size="xs">
+          <template #title>Credits reset on {{ formattedResetDate }}</template>
+        </CommonAlert>
         <div class="flex flex-col gap-y-3">
           <FormTextArea
             v-model="prompt"
@@ -38,7 +41,7 @@
               color="outline"
               size="sm"
               external
-              to="https://www.gendo.ai/terms-of-service?utm=speckle"
+              to="https://speckle.community/t/say-hello-to-ai-renders-in-speckle/15913"
               target="_blank"
             >
               <div class="flex items-center gap-1 text-foreground-2 font-normal">
@@ -105,6 +108,7 @@ import { useInjectedViewerState } from '~~/lib/viewer/composables/setup'
 import { useMixpanel } from '~/lib/core/composables/mp'
 import { CommonAlert, CommonBadge } from '@speckle/ui-components'
 import { ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/outline'
+import dayjs from 'dayjs'
 
 const {
   projectId,
@@ -147,6 +151,11 @@ const isOutOfCredits = computed(() => {
   return (limits.value?.used || 0) >= (limits.value?.limit || 0)
 })
 
+const formattedResetDate = computed(() => {
+  if (!limits.value?.resetDate) return ''
+  return dayjs(limits.value.resetDate).format('Do MMMM YYYY')
+})
+
 const enqueMagic = async () => {
   isLoading.value = true
   const [depthData, width, height] = await viewerInstance
diff --git a/packages/frontend-2/lib/common/generated/gql/graphql.ts b/packages/frontend-2/lib/common/generated/gql/graphql.ts
index 36a518e3b2..a12306758e 100644
--- a/packages/frontend-2/lib/common/generated/gql/graphql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/graphql.ts
@@ -4388,6 +4388,7 @@ export type WorkspaceMutations = {
   join: Workspace;
   leave: Scalars['Boolean']['output'];
   projects: WorkspaceProjectMutations;
+  requestToJoin: Scalars['Boolean']['output'];
   /** Set the default region where project data will be stored. Only available to admins. */
   setDefaultRegion: Workspace;
   update: Workspace;
@@ -4436,6 +4437,11 @@ export type WorkspaceMutationsLeaveArgs = {
 };
 
 
+export type WorkspaceMutationsRequestToJoinArgs = {
+  input: WorkspaceRequestToJoinInput;
+};
+
+
 export type WorkspaceMutationsSetDefaultRegionArgs = {
   regionKey: Scalars['String']['input'];
   workspaceId: Scalars['String']['input'];
@@ -4545,6 +4551,10 @@ export enum WorkspaceProjectsUpdatedMessageType {
   Removed = 'REMOVED'
 }
 
+export type WorkspaceRequestToJoinInput = {
+  workspaceId: Scalars['ID']['input'];
+};
+
 export enum WorkspaceRole {
   Admin = 'ADMIN',
   Guest = 'GUEST',
@@ -8133,6 +8143,7 @@ export type WorkspaceMutationsFieldArgs = {
   join: WorkspaceMutationsJoinArgs,
   leave: WorkspaceMutationsLeaveArgs,
   projects: {},
+  requestToJoin: WorkspaceMutationsRequestToJoinArgs,
   setDefaultRegion: WorkspaceMutationsSetDefaultRegionArgs,
   update: WorkspaceMutationsUpdateArgs,
   updateCreationState: WorkspaceMutationsUpdateCreationStateArgs,
diff --git a/packages/server/app.ts b/packages/server/app.ts
index eebc724317..a6be189f58 100644
--- a/packages/server/app.ts
+++ b/packages/server/app.ts
@@ -49,7 +49,8 @@ import {
   enableMixpanel,
   getPort,
   getBindAddress,
-  shutdownTimeoutSeconds
+  shutdownTimeoutSeconds,
+  asyncRequestContextEnabled
 } from '@/modules/shared/helpers/envHelper'
 import * as ModulesSetup from '@/modules'
 import { GraphQLContext, Optional } from '@/modules/shared/helpers/typeHelper'
@@ -78,6 +79,7 @@ import type { ReadinessHandler } from '@/healthchecks/types'
 import type ws from 'ws'
 import type { Server as MockWsServer } from 'mock-socket'
 import { SetOptional } from 'type-fest'
+import { initiateRequestContextMiddleware } from '@/logging/requestContext'
 
 const GRAPHQL_PATH = '/graphql'
 
@@ -405,9 +407,14 @@ export async function init() {
 
   app.use(cookieParser())
   app.use(DetermineRequestIdMiddleware)
+  app.use(initiateRequestContextMiddleware)
   app.use(determineClientIpAddressMiddleware)
   app.use(LoggingExpressMiddleware)
 
+  if (asyncRequestContextEnabled()) {
+    startupLogger.info('Async request context tracking enabled 👀')
+  }
+
   if (process.env.COMPRESSION) {
     app.use(compression())
   }
diff --git a/packages/server/assets/workspacesCore/typedefs/workspaces.graphql b/packages/server/assets/workspacesCore/typedefs/workspaces.graphql
index 97d360cb60..ab9797c64d 100644
--- a/packages/server/assets/workspacesCore/typedefs/workspaces.graphql
+++ b/packages/server/assets/workspacesCore/typedefs/workspaces.graphql
@@ -311,6 +311,17 @@ type Workspace {
   Info about the workspace creation state
   """
   creationState: WorkspaceCreationState
+  """
+  Get all join requests for all the workspaces the user is an admin of
+  """
+  adminWorkspacesJoinRequests(
+    filter: AdminWorkspaceJoinRequestFilter
+    cursor: String
+    limit: Int! = 25
+  ): WorkspaceJoinRequestCollection!
+    @hasServerRole(role: SERVER_USER)
+    @hasScope(scope: "workspace:read")
+    @hasWorkspaceRole(role: ADMIN)
 }
 
 type WorkspaceCreationState {
@@ -450,6 +461,29 @@ type WorkspaceCollection {
   items: [Workspace!]!
 }
 
+type WorkspaceJoinRequestCollection {
+  totalCount: Int!
+  cursor: String
+  items: [WorkspaceJoinRequest!]!
+}
+
+type WorkspaceJoinRequest {
+  workspace: Workspace!
+  user: LimitedUser!
+  status: WorkspaceJoinRequestStatus!
+  createdAt: DateTime!
+}
+
+enum WorkspaceJoinRequestStatus {
+  pending
+  accepted
+  denied
+}
+
+input AdminWorkspaceJoinRequestFilter {
+  status: WorkspaceJoinRequestStatus
+}
+
 extend type User {
   """
   Get discoverable workspaces with verified domains that match the active user's
diff --git a/packages/server/codegen.yml b/packages/server/codegen.yml
index 24a7a59011..3a977571d5 100644
--- a/packages/server/codegen.yml
+++ b/packages/server/codegen.yml
@@ -64,6 +64,7 @@ generates:
         WorkspaceBillingMutations: '@/modules/gatekeeper/helpers/graphTypes#WorkspaceBillingMutationsGraphQLReturn'
         PendingWorkspaceCollaborator: '@/modules/workspacesCore/helpers/graphTypes#PendingWorkspaceCollaboratorGraphQLReturn'
         WorkspaceCollaborator: '@/modules/workspacesCore/helpers/graphTypes#WorkspaceCollaboratorGraphQLReturn'
+        WorkspaceJoinRequest: '@/modules/workspacesCore/helpers/graphTypes#WorkspaceJoinRequestGraphQLReturn'
         Webhook: '@/modules/webhooks/helpers/graphTypes#WebhookGraphQLReturn'
         SmartTextEditorValue: '@/modules/core/services/richTextEditorService#SmartTextEditorValueGraphQLReturn'
         BlobMetadata: '@/modules/blobstorage/domain/types#BlobStorageItem'
diff --git a/packages/server/healthchecks/health.ts b/packages/server/healthchecks/health.ts
index a5fce4a51a..b0cefb4d0b 100644
--- a/packages/server/healthchecks/health.ts
+++ b/packages/server/healthchecks/health.ts
@@ -88,35 +88,9 @@ export const handleLivenessFactory =
 
 export const handleReadinessFactory = (deps: {
   isRedisAlive: RedisCheck
-  areAllPostgresAlive: MultiDBCheck
   getFreeConnectionsCalculators: () => FreeConnectionsCalculators
 }): ReadinessHandler => {
   return async () => {
-    const allPostgresResults = await deps.areAllPostgresAlive()
-    const deadPostgresKeys = Object.entries(allPostgresResults)
-      .filter((result) => !result[1].isAlive)
-      .map((result) => result[0])
-
-    if (deadPostgresKeys.length) {
-      throw new ReadinessError(
-        `Readiness health check failed. Postgres for ${join(
-          deadPostgresKeys,
-          ', '
-        )} is not available.`,
-        {
-          cause: new MultiError(
-            Object.entries(allPostgresResults).map((kv) =>
-              ensureErrorOrWrapAsCause(
-                //HACK: kv[1] is not typed correctly as the filter does not narrow the type
-                (kv[1] as { isAlive: false; err: unknown }).err,
-                'Unknown Postgres error.'
-              )
-            )
-          )
-        }
-      )
-    }
-
     const redisClient = getGenericRedis()
     const redisCheck = await deps.isRedisAlive({ client: redisClient })
     if (!redisCheck.isAlive) {
@@ -149,14 +123,11 @@ export const handleReadinessFactory = (deps: {
 
     return {
       details: {
-        postgres: merge(
-          allPostgresResults,
-          Object.fromEntries(
-            Object.entries(percentageFreeConnections).map(([k, v]) => [
-              k,
-              { percentageFreeConnections: v.toFixed(0) }
-            ])
-          )
+        postgres: Object.fromEntries(
+          Object.entries(percentageFreeConnections).map(([k, v]) => [
+            k,
+            { percentageFreeConnections: v.toFixed(0) }
+          ])
         ),
         redis: true
       }
diff --git a/packages/server/healthchecks/index.ts b/packages/server/healthchecks/index.ts
index 899b973755..b4c7be3017 100644
--- a/packages/server/healthchecks/index.ts
+++ b/packages/server/healthchecks/index.ts
@@ -44,7 +44,7 @@ export const updateFreeDbConnectionSamplers = async () => {
         knexFreeDbConnectionSamplerFactory({
           db: dbClient.client,
           collectionPeriod: highFrequencyMetricsCollectionPeriodMs(),
-          sampledDuration: 20_000 //number of ms over which to average the database connections, before declaring unready. 20 seconds.
+          sampledDuration: 4_000 //number of ms over which to average the database connections, before declaring unready. 4 seconds.
         })
       knexFreeDbConnectionSamplerReadiness[dbClient.regionKey].start()
     }
@@ -71,7 +71,6 @@ export const initFactory: () => (
 
     const readinessHandler = handleReadinessFactory({
       isRedisAlive,
-      areAllPostgresAlive,
       getFreeConnectionsCalculators: getKnexFreeDbConnectionSamplerReadiness
     })
 
diff --git a/packages/server/logging/expressLogging.ts b/packages/server/logging/expressLogging.ts
index 4a46e7db47..e5a7eaf486 100644
--- a/packages/server/logging/expressLogging.ts
+++ b/packages/server/logging/expressLogging.ts
@@ -10,7 +10,7 @@ import { ensureError, type Optional } from '@speckle/shared'
 import { getRequestParameters, getRequestPath } from '@/modules/core/helpers/server'
 import { get } from 'lodash'
 
-const REQUEST_ID_HEADER = 'x-request-id'
+export const REQUEST_ID_HEADER = 'x-request-id'
 
 const GenerateRequestId: GenReqId = (req: IncomingMessage) => DetermineRequestId(req)
 
diff --git a/packages/server/logging/knexMonitoring.ts b/packages/server/logging/knexMonitoring.ts
index 3114b0c730..28834d6d23 100644
--- a/packages/server/logging/knexMonitoring.ts
+++ b/packages/server/logging/knexMonitoring.ts
@@ -4,6 +4,7 @@ import { type Knex } from 'knex'
 import { Logger } from 'pino'
 import { toNDecimalPlaces } from '@/modules/core/utils/formatting'
 import { omit } from 'lodash'
+import { getRequestContext } from '@/logging/requestContext'
 
 let metricQueryDuration: prometheusClient.Summary<string>
 let metricQueryErrors: prometheusClient.Counter<string>
@@ -214,6 +215,15 @@ const initKnexPrometheusMetricsForRegionEvents = async (params: {
         .observe(durationSec)
 
     const trace = (new Error().stack || '').split('\n').slice(1).join('\n').trim()
+    const reqCtx = getRequestContext()
+
+    // Update reqCtx with DB query metrics
+    if (reqCtx) {
+      reqCtx.dbMetrics.totalCount++
+      reqCtx.dbMetrics.totalDuration += durationMs || 0
+      reqCtx.dbMetrics.queries.push(data.sql)
+    }
+
     params.logger.info(
       {
         region,
@@ -222,7 +232,8 @@ const initKnexPrometheusMetricsForRegionEvents = async (params: {
         sqlQueryId: queryId,
         sqlQueryDurationMs: toNDecimalPlaces(durationMs, 0),
         sqlNumberBindings: data.bindings?.length || -1,
-        trace
+        trace,
+        ...(reqCtx ? { req: { id: reqCtx.requestId } } : {})
       },
       'DB query successfully completed after {sqlQueryDurationMs} ms'
     )
@@ -243,6 +254,17 @@ const initKnexPrometheusMetricsForRegionEvents = async (params: {
         })
         .observe(durationSec)
     metricQueryErrors.inc()
+
+    const trace = (new Error().stack || '').split('\n').slice(1).join('\n').trim()
+    const reqCtx = getRequestContext()
+
+    // Update reqCtx with DB query metrics
+    if (reqCtx) {
+      reqCtx.dbMetrics.totalCount++
+      reqCtx.dbMetrics.totalDuration += durationMs || 0
+      reqCtx.dbMetrics.queries.push(data.sql)
+    }
+
     params.logger.warn(
       {
         err: typeof err === 'object' ? omit(err, 'detail') : err,
@@ -251,7 +273,9 @@ const initKnexPrometheusMetricsForRegionEvents = async (params: {
         sqlMethod: normalizeSqlMethod(data.method),
         sqlQueryId: queryId,
         sqlQueryDurationMs: toNDecimalPlaces(durationMs, 0),
-        sqlNumberBindings: data.bindings?.length || -1
+        sqlNumberBindings: data.bindings?.length || -1,
+        trace,
+        ...(reqCtx ? { req: { id: reqCtx.requestId } } : {})
       },
       'DB query errored for {sqlMethod} after {sqlQueryDurationMs}ms'
     )
diff --git a/packages/server/logging/requestContext.ts b/packages/server/logging/requestContext.ts
new file mode 100644
index 0000000000..303b433a80
--- /dev/null
+++ b/packages/server/logging/requestContext.ts
@@ -0,0 +1,37 @@
+import { REQUEST_ID_HEADER } from '@/logging/expressLogging'
+import { asyncRequestContextEnabled } from '@/modules/shared/helpers/envHelper'
+import type express from 'express'
+import { AsyncLocalStorage } from 'node:async_hooks'
+
+type StorageType = {
+  requestId: string
+  dbMetrics: {
+    totalDuration: number
+    totalCount: number
+    queries: string[]
+  }
+}
+
+const storage = asyncRequestContextEnabled()
+  ? new AsyncLocalStorage<StorageType>()
+  : undefined
+
+export const initiateRequestContextMiddleware: express.RequestHandler = (
+  req,
+  _res,
+  next
+) => {
+  const reqId = req.headers[REQUEST_ID_HEADER] || 'unknown'
+  const store: StorageType = {
+    requestId: reqId as string,
+    dbMetrics: {
+      totalCount: 0,
+      totalDuration: 0,
+      queries: []
+    }
+  }
+  storage?.enterWith(store)
+  next()
+}
+
+export const getRequestContext = () => storage?.getStore()
diff --git a/packages/server/modules/automate/domain/events.ts b/packages/server/modules/automate/domain/events.ts
new file mode 100644
index 0000000000..c0bda159a3
--- /dev/null
+++ b/packages/server/modules/automate/domain/events.ts
@@ -0,0 +1,52 @@
+import {
+  AutomationFunctionRunRecord,
+  AutomationRecord,
+  AutomationRunRecord,
+  AutomationTriggerType,
+  AutomationWithRevision,
+  BaseTriggerManifest,
+  RunTriggerSource
+} from '@/modules/automate/helpers/types'
+import {
+  InsertableAutomationRun,
+  StoredInsertableAutomationRevision
+} from '@/modules/automate/repositories/automations'
+
+export const automationEventsNamespace = 'automations' as const
+export const automationRunEventsNamespace = 'automationRuns' as const
+
+export const AutomationEvents = {
+  Created: `${automationEventsNamespace}.created`,
+  Updated: `${automationEventsNamespace}.updated`,
+  CreatedRevision: `${automationEventsNamespace}.created-revision`
+} as const
+
+export const AutomationRunEvents = {
+  Created: `${automationRunEventsNamespace}.created`,
+  StatusUpdated: `${automationRunEventsNamespace}.status-updated`
+} as const
+
+export type AutomationEventsPayloads = {
+  [AutomationEvents.Created]: { automation: AutomationRecord }
+  [AutomationEvents.Updated]: { automation: AutomationRecord }
+  [AutomationEvents.CreatedRevision]: {
+    automation: AutomationRecord
+    revision: StoredInsertableAutomationRevision
+  }
+}
+
+export type AutomationRunEventsPayloads = {
+  [AutomationRunEvents.Created]: {
+    automation: AutomationWithRevision
+    run: InsertableAutomationRun
+    manifests: BaseTriggerManifest[]
+    source: RunTriggerSource
+    triggerType: AutomationTriggerType
+  }
+  [AutomationRunEvents.StatusUpdated]: {
+    run: AutomationRunRecord
+    functionRun: AutomationFunctionRunRecord
+    automationId: string
+    projectId: string
+  }
+}
diff --git a/packages/server/modules/automate/events/automations.ts b/packages/server/modules/automate/events/automations.ts
deleted file mode 100644
index 73eac53b51..0000000000
--- a/packages/server/modules/automate/events/automations.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { AutomationRecord } from '@/modules/automate/helpers/types'
-import { StoredInsertableAutomationRevision } from '@/modules/automate/repositories/automations'
-import { initializeModuleEventEmitter } from '@/modules/shared/services/moduleEventEmitterSetup'
-
-export enum AutomationsEvents {
-  Created = 'created',
-  Updated = 'updated',
-  CreatedRevision = 'created-revision'
-}
-
-export type AutomationsEventsPayloads = {
-  [AutomationsEvents.Created]: {
-    automation: AutomationRecord
-  }
-  [AutomationsEvents.Updated]: {
-    automation: AutomationRecord
-  }
-  [AutomationsEvents.CreatedRevision]: {
-    automation: AutomationRecord
-    revision: StoredInsertableAutomationRevision
-  }
-}
-
-const { emit, listen } = initializeModuleEventEmitter<AutomationsEventsPayloads>({
-  moduleName: 'automate',
-  namespace: 'runs'
-})
-
-export const AutomationsEmitter = { emit, listen, events: AutomationsEvents }
-
-export type AutomationsEventsEmit = (typeof AutomationsEmitter)['emit']
-export type AutomationsEventsListen = (typeof AutomationsEmitter)['listen']
diff --git a/packages/server/modules/automate/events/runs.ts b/packages/server/modules/automate/events/runs.ts
deleted file mode 100644
index 76d61041f5..0000000000
--- a/packages/server/modules/automate/events/runs.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {
-  AutomationFunctionRunRecord,
-  AutomationRunRecord,
-  AutomationTriggerType,
-  AutomationWithRevision,
-  BaseTriggerManifest,
-  RunTriggerSource
-} from '@/modules/automate/helpers/types'
-import { InsertableAutomationRun } from '@/modules/automate/repositories/automations'
-import { initializeModuleEventEmitter } from '@/modules/shared/services/moduleEventEmitterSetup'
-
-export enum AutomateRunsEvents {
-  Created = 'created',
-  StatusUpdated = 'status-updated'
-}
-
-export type AutomateEventsPayloads = {
-  [AutomateRunsEvents.Created]: {
-    automation: AutomationWithRevision
-    run: InsertableAutomationRun
-    manifests: BaseTriggerManifest[]
-    source: RunTriggerSource
-    triggerType: AutomationTriggerType
-  }
-  [AutomateRunsEvents.StatusUpdated]: {
-    run: AutomationRunRecord
-    functionRun: AutomationFunctionRunRecord
-    automationId: string
-    projectId: string
-  }
-}
-
-const { emit, listen } = initializeModuleEventEmitter<AutomateEventsPayloads>({
-  moduleName: 'automate',
-  namespace: 'runs'
-})
-
-export const AutomateRunsEmitter = { emit, listen, events: AutomateRunsEvents }
-
-export type AutomateRunsEventsEmitter = (typeof AutomateRunsEmitter)['emit']
-export type AutomateRunsEventsListener = (typeof AutomateRunsEmitter)['listen']
diff --git a/packages/server/modules/automate/graph/resolvers/automate.ts b/packages/server/modules/automate/graph/resolvers/automate.ts
index 9d79aad217..ee73445208 100644
--- a/packages/server/modules/automate/graph/resolvers/automate.ts
+++ b/packages/server/modules/automate/graph/resolvers/automate.ts
@@ -112,8 +112,6 @@ import {
   ExecutionEngineNetworkError
 } from '@/modules/automate/errors/executionEngine'
 import { db } from '@/db/knex'
-import { AutomationsEmitter } from '@/modules/automate/events/automations'
-import { AutomateRunsEmitter } from '@/modules/automate/events/runs'
 import { getCommitFactory } from '@/modules/core/repositories/commits'
 import { validateStreamAccessFactory } from '@/modules/core/services/streams/access'
 import { getUserFactory } from '@/modules/core/repositories/users'
@@ -574,7 +572,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED
             storeAutomation: storeAutomationFactory({ db: projectDb }),
             storeAutomationToken: storeAutomationTokenFactory({ db: projectDb }),
             validateStreamAccess,
-            automationsEventsEmit: AutomationsEmitter.emit
+            eventEmit: getEventBus().emit
           })
 
           return (
@@ -593,7 +591,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED
             getAutomation: getAutomationFactory({ db: projectDb }),
             updateAutomation: updateAutomationFactory({ db: projectDb }),
             validateStreamAccess,
-            automationsEventsEmit: AutomationsEmitter.emit
+            eventEmit: getEventBus().emit
           })
 
           return await update({
@@ -616,7 +614,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED
               buildDecryptor
             }),
             getFunctionReleases,
-            automationsEventsEmit: AutomationsEmitter.emit,
+            eventEmit: getEventBus().emit,
             validateStreamAccess
           })
 
@@ -643,7 +641,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED
                 buildDecryptor
               }),
               createAppToken,
-              automateRunsEmitter: AutomateRunsEmitter.emit,
+              emitEvent: getEventBus().emit,
               getAutomationToken: getAutomationTokenFactory({ db: projectDb }),
               upsertAutomationRun: upsertAutomationRunFactory({ db: projectDb }),
               getFullAutomationRevisionMetadata:
@@ -672,7 +670,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED
             storeAutomation: storeAutomationFactory({ db: projectDb }),
             storeAutomationRevision: storeAutomationRevisionFactory({ db: projectDb }),
             validateStreamAccess,
-            automationsEventsEmit: AutomationsEmitter.emit
+            eventEmit: getEventBus().emit
           })
 
           return await create({
@@ -900,7 +898,7 @@ export = (FF_AUTOMATE_MODULE_ENABLED
             automationRunUpdater: updateAutomationRunFactory({
               db: projectDb
             }),
-            runEventEmit: AutomateRunsEmitter.emit
+            emitEvent: getEventBus().emit
           }
 
           const payload = {
diff --git a/packages/server/modules/automate/index.ts b/packages/server/modules/automate/index.ts
index 2ca3e4ae9e..c8a79fa83e 100644
--- a/packages/server/modules/automate/index.ts
+++ b/packages/server/modules/automate/index.ts
@@ -28,12 +28,7 @@ import authGithubAppRest from '@/modules/automate/rest/authGithubApp'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import { TokenScopeData } from '@/modules/shared/domain/rolesAndScopes/types'
 import { db } from '@/db/knex'
-import {
-  AutomationsEmitter,
-  AutomationsEvents
-} from '@/modules/automate/events/automations'
 import { ProjectSubscriptions, publish } from '@/modules/shared/utils/subscriptions'
-import { AutomateRunsEmitter, AutomateRunsEvents } from '@/modules/automate/events/runs'
 import { getBranchLatestCommitsFactory } from '@/modules/core/repositories/branches'
 import { getCommitFactory } from '@/modules/core/repositories/commits'
 import { legacyGetUserFactory } from '@/modules/core/repositories/users'
@@ -59,6 +54,7 @@ import { mixpanel } from '@/modules/shared/utils/mixpanel'
 import { getProjectFactory } from '@/modules/core/repositories/projects'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { VersionEvents } from '@/modules/core/domain/commits/events'
+import { AutomationEvents, AutomationRunEvents } from '@/modules/automate/domain/events'
 
 const { FF_AUTOMATE_MODULE_ENABLED } = getFeatureFlags()
 let quitListeners: Optional<() => void> = undefined
@@ -115,7 +111,7 @@ const initializeEventListeners = () => {
               buildDecryptor
             }),
             createAppToken,
-            automateRunsEmitter: AutomateRunsEmitter.emit,
+            emitEvent: getEventBus().emit,
             getAutomationToken: getAutomationTokenFactory({ db: projectDb }),
             upsertAutomationRun: upsertAutomationRunFactory({ db: projectDb }),
             getFullAutomationRevisionMetadata: getFullAutomationRevisionMetadataFactory(
@@ -128,31 +124,37 @@ const initializeEventListeners = () => {
       }
     ),
     // Automation management events
-    AutomationsEmitter.listen(AutomationsEvents.Created, async ({ automation }) => {
-      await publish(ProjectSubscriptions.ProjectAutomationsUpdated, {
-        projectId: automation.projectId,
-        projectAutomationsUpdated: {
-          type: ProjectAutomationsUpdatedMessageType.Created,
-          automationId: automation.id,
-          automation,
-          revision: null
-        }
-      })
-    }),
-    AutomationsEmitter.listen(AutomationsEvents.Updated, async ({ automation }) => {
-      await publish(ProjectSubscriptions.ProjectAutomationsUpdated, {
-        projectId: automation.projectId,
-        projectAutomationsUpdated: {
-          type: ProjectAutomationsUpdatedMessageType.Updated,
-          automationId: automation.id,
-          automation,
-          revision: null
-        }
-      })
-    }),
-    AutomationsEmitter.listen(
-      AutomationsEvents.CreatedRevision,
-      async ({ automation, revision }) => {
+    getEventBus().listen(
+      AutomationEvents.Created,
+      async ({ payload: { automation } }) => {
+        await publish(ProjectSubscriptions.ProjectAutomationsUpdated, {
+          projectId: automation.projectId,
+          projectAutomationsUpdated: {
+            type: ProjectAutomationsUpdatedMessageType.Created,
+            automationId: automation.id,
+            automation,
+            revision: null
+          }
+        })
+      }
+    ),
+    getEventBus().listen(
+      AutomationEvents.Updated,
+      async ({ payload: { automation } }) => {
+        await publish(ProjectSubscriptions.ProjectAutomationsUpdated, {
+          projectId: automation.projectId,
+          projectAutomationsUpdated: {
+            type: ProjectAutomationsUpdatedMessageType.Updated,
+            automationId: automation.id,
+            automation,
+            revision: null
+          }
+        })
+      }
+    ),
+    getEventBus().listen(
+      AutomationEvents.CreatedRevision,
+      async ({ payload: { automation, revision } }) => {
         await publish(ProjectSubscriptions.ProjectAutomationsUpdated, {
           projectId: automation.projectId,
           projectAutomationsUpdated: {
@@ -168,9 +170,9 @@ const initializeEventListeners = () => {
       }
     ),
     // Automation run lifecycle events
-    AutomateRunsEmitter.listen(
-      AutomateRunsEvents.Created,
-      async ({ manifests, run, automation }) => {
+    getEventBus().listen(
+      AutomationRunEvents.Created,
+      async ({ payload: { manifests, run, automation } }) => {
         const validatedManifests = manifests
           .map((manifest) => {
             if (isVersionCreatedTriggerManifest(manifest)) {
@@ -214,9 +216,9 @@ const initializeEventListeners = () => {
         )
       }
     ),
-    AutomateRunsEmitter.listen(
-      AutomateRunsEvents.StatusUpdated,
-      async ({ run, functionRun, automationId, projectId }) => {
+    getEventBus().listen(
+      AutomationRunEvents.StatusUpdated,
+      async ({ payload: { run, functionRun, automationId, projectId } }) => {
         const projectDb = await getProjectDbClient({ projectId })
 
         const triggers = await getAutomationRunFullTriggersFactory({ db: projectDb })({
@@ -253,9 +255,9 @@ const initializeEventListeners = () => {
       }
     ),
     // Mixpanel events
-    AutomateRunsEmitter.listen(
-      AutomateRunsEvents.StatusUpdated,
-      async ({ run, functionRun, automationId, projectId }) => {
+    getEventBus().listen(
+      AutomationRunEvents.StatusUpdated,
+      async ({ payload: { run, functionRun, automationId, projectId } }) => {
         if (!isFinished(run.status)) return
 
         const projectDb = await getProjectDbClient({ projectId })
@@ -301,9 +303,9 @@ const initializeEventListeners = () => {
         })
       }
     ),
-    AutomateRunsEmitter.listen(
-      AutomateRunsEvents.Created,
-      async ({ automation, run: automationRun, source, manifests }) => {
+    getEventBus().listen(
+      AutomationRunEvents.Created,
+      async ({ payload: { automation, run: automationRun, source, manifests } }) => {
         const manifest = manifests.at(0)
         if (!manifest || !isVersionCreatedTriggerManifest(manifest)) {
           automateLogger.error('Unexpected run trigger manifest type', {
diff --git a/packages/server/modules/automate/services/automationManagement.ts b/packages/server/modules/automate/services/automationManagement.ts
index 85753daaca..14a4c91102 100644
--- a/packages/server/modules/automate/services/automationManagement.ts
+++ b/packages/server/modules/automate/services/automationManagement.ts
@@ -38,10 +38,6 @@ import { TriggeredAutomationsStatusGraphQLReturn } from '@/modules/automate/help
 import { FunctionInputDecryptor } from '@/modules/automate/services/encryption'
 import { LibsodiumEncryptionError } from '@/modules/shared/errors/encryption'
 import { validateInputAgainstFunctionSchema } from '@/modules/automate/utils/inputSchemaValidator'
-import {
-  AutomationsEmitter,
-  AutomationsEventsEmit
-} from '@/modules/automate/events/automations'
 import { validateAutomationName } from '@/modules/automate/utils/automationConfigurationValidator'
 import {
   CreateAutomation,
@@ -56,6 +52,8 @@ import {
 } from '@/modules/automate/domain/operations'
 import { GetBranchesByIds } from '@/modules/core/domain/branches/operations'
 import { ValidateStreamAccess } from '@/modules/core/domain/streams/operations'
+import { EventBusEmit } from '@/modules/shared/services/eventBus'
+import { AutomationEvents } from '@/modules/automate/domain/events'
 
 export type CreateAutomationDeps = {
   createAuthCode: CreateStoredAuthCode
@@ -63,7 +61,7 @@ export type CreateAutomationDeps = {
   storeAutomation: StoreAutomation
   storeAutomationToken: StoreAutomationToken
   validateStreamAccess: ValidateStreamAccess
-  automationsEventsEmit: AutomationsEventsEmit
+  eventEmit: EventBusEmit
 }
 
 export const createAutomationFactory =
@@ -86,7 +84,7 @@ export const createAutomationFactory =
       storeAutomation,
       storeAutomationToken,
       validateStreamAccess,
-      automationsEventsEmit
+      eventEmit
     } = deps
 
     validateAutomationName(name)
@@ -129,8 +127,11 @@ export const createAutomationFactory =
       automateToken: token
     })
 
-    await automationsEventsEmit(AutomationsEmitter.events.Created, {
-      automation: automationRecord
+    await eventEmit({
+      eventName: AutomationEvents.Created,
+      payload: {
+        automation: automationRecord
+      }
     })
 
     return { automation: automationRecord, token: automationTokenRecord }
@@ -142,7 +143,7 @@ export type CreateTestAutomationDeps = {
   storeAutomation: StoreAutomation
   storeAutomationRevision: StoreAutomationRevision
   validateStreamAccess: ValidateStreamAccess
-  automationsEventsEmit: AutomationsEventsEmit
+  eventEmit: EventBusEmit
 }
 
 /**
@@ -169,7 +170,7 @@ export const createTestAutomationFactory =
       storeAutomation,
       storeAutomationRevision,
       validateStreamAccess,
-      automationsEventsEmit
+      eventEmit
     } = deps
 
     validateAutomationName(name)
@@ -208,8 +209,11 @@ export const createTestAutomationFactory =
       isTestAutomation: true
     })
 
-    await AutomationsEmitter.emit(AutomationsEmitter.events.Created, {
-      automation: automationRecord
+    await eventEmit({
+      eventName: AutomationEvents.Created,
+      payload: {
+        automation: automationRecord
+      }
     })
 
     // Create and store the automation revision
@@ -235,9 +239,12 @@ export const createTestAutomationFactory =
       publicKey: encryptionKeyPair.publicKey
     })
 
-    await automationsEventsEmit(AutomationsEmitter.events.CreatedRevision, {
-      automation: automationRecord,
-      revision: automationRevisionRecord
+    await eventEmit({
+      eventName: AutomationEvents.CreatedRevision,
+      payload: {
+        automation: automationRecord,
+        revision: automationRevisionRecord
+      }
     })
 
     return automationRecord
@@ -247,7 +254,7 @@ export type ValidateAndUpdateAutomationDeps = {
   getAutomation: GetAutomation
   updateAutomation: UpdateAutomation
   validateStreamAccess: ValidateStreamAccess
-  automationsEventsEmit: AutomationsEventsEmit
+  eventEmit: EventBusEmit
 }
 
 export const validateAndUpdateAutomationFactory =
@@ -261,12 +268,7 @@ export const validateAndUpdateAutomationFactory =
      */
     projectId?: string
   }) => {
-    const {
-      getAutomation,
-      updateAutomation,
-      validateStreamAccess,
-      automationsEventsEmit
-    } = deps
+    const { getAutomation, updateAutomation, validateStreamAccess, eventEmit } = deps
     const { input, userId, userResourceAccessRules, projectId } = params
 
     const existingAutomation = await getAutomation({
@@ -297,8 +299,11 @@ export const validateAndUpdateAutomationFactory =
       id: input.id
     })
 
-    await automationsEventsEmit(AutomationsEmitter.events.Updated, {
-      automation: res
+    await eventEmit({
+      eventName: AutomationEvents.Updated,
+      payload: {
+        automation: res
+      }
     })
 
     return res
@@ -396,7 +401,7 @@ export type CreateAutomationRevisionDeps = {
   getFunctionInputDecryptor: FunctionInputDecryptor
   getFunctionReleases: typeof getFunctionReleases
   validateStreamAccess: ValidateStreamAccess
-  automationsEventsEmit: AutomationsEventsEmit
+  eventEmit: EventBusEmit
 } & ValidateNewTriggerDefinitionsDeps &
   ValidateNewRevisionFunctionsDeps
 
@@ -416,7 +421,7 @@ export const createAutomationRevisionFactory =
       getFunctionInputDecryptor,
       getFunctionReleases,
       validateStreamAccess,
-      automationsEventsEmit
+      eventEmit
     } = deps
 
     const existingAutomation = await getAutomation({
@@ -538,9 +543,12 @@ export const createAutomationRevisionFactory =
     }
     const res = await storeAutomationRevision(revisionInput)
 
-    await automationsEventsEmit(AutomationsEmitter.events.CreatedRevision, {
-      automation: existingAutomation,
-      revision: res
+    await eventEmit({
+      eventName: AutomationEvents.CreatedRevision,
+      payload: {
+        automation: existingAutomation,
+        revision: res
+      }
     })
 
     return res
diff --git a/packages/server/modules/automate/services/runsManagement.ts b/packages/server/modules/automate/services/runsManagement.ts
index 3e6827717b..32ce63362a 100644
--- a/packages/server/modules/automate/services/runsManagement.ts
+++ b/packages/server/modules/automate/services/runsManagement.ts
@@ -1,3 +1,4 @@
+import { AutomationRunEvents } from '@/modules/automate/domain/events'
 import {
   GetFunctionRun,
   UpdateAutomationRun,
@@ -7,15 +8,12 @@ import {
   FunctionRunReportStatusError,
   FunctionRunNotFoundError
 } from '@/modules/automate/errors/runs'
-import {
-  AutomateRunsEmitter,
-  AutomateRunsEventsEmitter
-} from '@/modules/automate/events/runs'
 import {
   AutomationFunctionRunRecord,
   AutomationRunStatus,
   AutomationRunStatuses
 } from '@/modules/automate/helpers/types'
+import { EventBusEmit } from '@/modules/shared/services/eventBus'
 import { Automate } from '@speckle/shared'
 
 const AutomationRunStatusOrder: { [key in AutomationRunStatus]: number } = {
@@ -91,7 +89,7 @@ export type ReportFunctionRunStatusDeps = {
   getAutomationFunctionRunRecord: GetFunctionRun
   upsertAutomationFunctionRunRecord: UpsertAutomationFunctionRun
   automationRunUpdater: UpdateAutomationRun
-  runEventEmit: AutomateRunsEventsEmitter
+  emitEvent: EventBusEmit
 }
 
 export const reportFunctionRunStatusFactory =
@@ -106,7 +104,7 @@ export const reportFunctionRunStatusFactory =
       getAutomationFunctionRunRecord,
       upsertAutomationFunctionRunRecord,
       automationRunUpdater,
-      runEventEmit
+      emitEvent
     } = deps
     const { projectId, runId, ...statusReportData } = params
 
@@ -147,11 +145,14 @@ export const reportFunctionRunStatusFactory =
       updatedAt: new Date()
     })
 
-    await runEventEmit(AutomateRunsEmitter.events.StatusUpdated, {
-      run: updatedRun,
-      functionRun: nextFunctionRunRecord,
-      automationId,
-      projectId
+    await emitEvent({
+      eventName: AutomationRunEvents.StatusUpdated,
+      payload: {
+        run: updatedRun,
+        functionRun: nextFunctionRunRecord,
+        automationId,
+        projectId
+      }
     })
 
     return true
diff --git a/packages/server/modules/automate/services/trigger.ts b/packages/server/modules/automate/services/trigger.ts
index 8d72e5fe9e..855e0dfe35 100644
--- a/packages/server/modules/automate/services/trigger.ts
+++ b/packages/server/modules/automate/services/trigger.ts
@@ -28,10 +28,6 @@ import { TokenResourceIdentifierType } from '@/modules/core/graph/generated/grap
 import { automateLogger } from '@/logging/logging'
 import { FunctionInputDecryptor } from '@/modules/automate/services/encryption'
 import { LibsodiumEncryptionError } from '@/modules/shared/errors/encryption'
-import {
-  AutomateRunsEmitter,
-  AutomateRunsEventsEmitter
-} from '@/modules/automate/events/runs'
 import {
   GetActiveTriggerDefinitions,
   GetAutomation,
@@ -48,6 +44,8 @@ import { GetBranchLatestCommits } from '@/modules/core/domain/branches/operation
 import { GetCommit } from '@/modules/core/domain/commits/operations'
 import { ValidateStreamAccess } from '@/modules/core/domain/streams/operations'
 import { CreateAndStoreAppToken } from '@/modules/core/domain/tokens/operations'
+import { EventBusEmit } from '@/modules/shared/services/eventBus'
+import { AutomationRunEvents } from '@/modules/automate/domain/events'
 
 export type OnModelVersionCreateDeps = {
   getAutomation: GetAutomation
@@ -214,7 +212,7 @@ export type TriggerAutomationRevisionRunDeps = {
   getAutomationToken: GetAutomationToken
   createAppToken: CreateAndStoreAppToken
   upsertAutomationRun: UpsertAutomationRun
-  automateRunsEmitter: AutomateRunsEventsEmitter
+  emitEvent: EventBusEmit
   getFullAutomationRevisionMetadata: GetFullAutomationRevisionMetadata
   getCommit: GetCommit
 } & CreateAutomationRunDataDeps &
@@ -235,7 +233,7 @@ export const triggerAutomationRevisionRunFactory =
       getAutomationToken,
       createAppToken,
       upsertAutomationRun,
-      automateRunsEmitter,
+      emitEvent,
       getFullAutomationRevisionMetadata,
       getCommit
     } = deps
@@ -316,12 +314,15 @@ export const triggerAutomationRevisionRunFactory =
       await upsertAutomationRun(automationRun)
     }
 
-    await automateRunsEmitter(AutomateRunsEmitter.events.Created, {
-      run: automationRun,
-      manifests: triggerManifests,
-      automation: automationWithRevision,
-      source,
-      triggerType: manifest.triggerType
+    await emitEvent({
+      eventName: AutomationRunEvents.Created,
+      payload: {
+        run: automationRun,
+        manifests: triggerManifests,
+        automation: automationWithRevision,
+        source,
+        triggerType: manifest.triggerType
+      }
     })
 
     return { automationRunId: automationRun.id }
diff --git a/packages/server/modules/automate/tests/automations.spec.ts b/packages/server/modules/automate/tests/automations.spec.ts
index c5edd6bb50..cb916dcd0b 100644
--- a/packages/server/modules/automate/tests/automations.spec.ts
+++ b/packages/server/modules/automate/tests/automations.spec.ts
@@ -42,7 +42,6 @@ import { expect } from 'chai'
 import { times } from 'lodash'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import { db } from '@/db/knex'
-import { AutomationsEmitter } from '@/modules/automate/events/automations'
 import {
   addOrUpdateStreamCollaboratorFactory,
   validateStreamAccessFactory
@@ -56,6 +55,8 @@ import {
 import { saveActivityFactory } from '@/modules/activitystream/repositories'
 import { publish } from '@/modules/shared/utils/subscriptions'
 import { getUserFactory } from '@/modules/core/repositories/users'
+import { getEventBus } from '@/modules/shared/services/eventBus'
+import { AutomationEvents } from '@/modules/automate/domain/events'
 
 /**
  * TODO: Extra test ideas
@@ -89,7 +90,7 @@ const buildAutomationUpdate = () => {
     getAutomation,
     updateAutomation: updateDbAutomation,
     validateStreamAccess,
-    automationsEventsEmit: AutomationsEmitter.emit
+    eventEmit: getEventBus().emit
   })
 
   return update
@@ -182,10 +183,17 @@ const buildAutomationUpdate = () => {
       })
 
       it('creates an automation', async () => {
+        let eventFired = false
+        const name = 'My Super Automation #1'
+
+        getEventBus().listenOnce(AutomationEvents.Created, async ({ payload }) => {
+          expect(payload.automation.name).to.equal(name)
+          eventFired = true
+        })
         const create = buildAutomationCreate()
 
         const automation = await create({
-          input: { name: 'Automation #1', enabled: true },
+          input: { name, enabled: true },
           projectId: myStream.id,
           userId: me.id
         })
@@ -193,6 +201,8 @@ const buildAutomationUpdate = () => {
         expect(automation).to.be.ok
         expect(automation.automation).to.be.ok
         expect(automation.token).to.be.ok
+        expect(automation.automation.name).to.equal(name)
+        expect(eventFired).to.be.true
       })
     })
 
@@ -264,6 +274,14 @@ const buildAutomationUpdate = () => {
           userId: me.id
         })
 
+        let eventFired = false
+        getEventBus().listenOnce(AutomationEvents.Updated, async ({ payload }) => {
+          expect(payload.automation.name).to.equal(initAutomation.name)
+          expect(payload.automation.enabled).to.be.false
+          expect(payload.automation.id).to.equal(initAutomation.id)
+          eventFired = true
+        })
+
         const updatedAutomation = await update({
           input: { id: initAutomation.id, enabled: false },
           userId: me.id,
@@ -273,6 +291,7 @@ const buildAutomationUpdate = () => {
         expect(updatedAutomation).to.be.ok
         expect(updatedAutomation.enabled).to.be.false
         expect(updatedAutomation.name).to.equal(initAutomation.name)
+        expect(eventFired).to.be.true
       })
 
       it('updates all available properties', async () => {
@@ -339,6 +358,15 @@ const buildAutomationUpdate = () => {
       })
 
       it('works successfully', async () => {
+        let eventFired = false
+        getEventBus().listenOnce(
+          AutomationEvents.CreatedRevision,
+          async ({ payload }) => {
+            expect(payload.automation.id).to.equal(createdAutomation.automation.id)
+            expect(payload.revision).to.be.ok
+            eventFired = true
+          }
+        )
         const create = buildAutomationRevisionCreate()
 
         const ret = await create({
@@ -352,6 +380,7 @@ const buildAutomationUpdate = () => {
         expect(ret.automationId).to.equal(createdAutomation.automation.id)
         expect(ret.triggers.length).to.be.ok
         expect(ret.functions.length).to.be.ok
+        expect(eventFired).to.be.true
       })
 
       it('fails if automation does not exist', async () => {
diff --git a/packages/server/modules/automate/tests/trigger.spec.ts b/packages/server/modules/automate/tests/trigger.spec.ts
index ca83b998ae..7db34b8d24 100644
--- a/packages/server/modules/automate/tests/trigger.spec.ts
+++ b/packages/server/modules/automate/tests/trigger.spec.ts
@@ -74,7 +74,6 @@ import {
 import { buildDecryptor } from '@/modules/shared/utils/libsodium'
 import { mapGqlStatusToDbStatus } from '@/modules/automate/utils/automateFunctionRunStatus'
 import { db } from '@/db/knex'
-import { AutomateRunsEmitter } from '@/modules/automate/events/runs'
 import { getCommitFactory } from '@/modules/core/repositories/commits'
 import { validateStreamAccessFactory } from '@/modules/core/services/streams/access'
 import { authorizeResolver } from '@/modules/shared'
@@ -85,6 +84,8 @@ import {
   storeTokenScopesFactory,
   storeUserServerAppTokenFactory
 } from '@/modules/core/repositories/tokens'
+import { getEventBus } from '@/modules/shared/services/eventBus'
+import { AutomationRunEvents } from '@/modules/automate/domain/events'
 
 const { FF_AUTOMATE_MODULE_ENABLED } = getFeatureFlags()
 
@@ -336,7 +337,7 @@ const createAppToken = createAppTokenFactory({
             }),
             getEncryptionKeyPairFor,
             createAppToken,
-            automateRunsEmitter: AutomateRunsEmitter.emit,
+            emitEvent: getEventBus().emit,
             getAutomationToken,
             upsertAutomationRun,
             getFullAutomationRevisionMetadata,
@@ -430,7 +431,7 @@ const createAppToken = createAppTokenFactory({
           }),
           getEncryptionKeyPairFor,
           createAppToken,
-          automateRunsEmitter: AutomateRunsEmitter.emit,
+          emitEvent: getEventBus().emit,
           getAutomationToken,
           upsertAutomationRun,
           getFullAutomationRevisionMetadata,
@@ -521,6 +522,18 @@ const createAppToken = createAppTokenFactory({
             }
           ]
         })
+
+        let eventFired = false
+        getEventBus().listenOnce(
+          AutomationRunEvents.Created,
+          async ({ payload }) => {
+            expect(payload.automation.id).to.equal(automation.id)
+            expect(payload.run.automationRevisionId).to.equal(automationRevisionId)
+            expect(payload.source).to.equal(RunTriggerSource.Manual)
+            eventFired = true
+          },
+          { timeout: 1000 }
+        )
         const executionEngineRunId = cryptoRandomString({ length: 10 })
         const { automationRunId } = await triggerAutomationRevisionRunFactory({
           automateRunTrigger: async () => ({
@@ -531,7 +544,7 @@ const createAppToken = createAppTokenFactory({
           }),
           getEncryptionKeyPairFor,
           createAppToken,
-          automateRunsEmitter: AutomateRunsEmitter.emit,
+          emitEvent: getEventBus().emit,
           getAutomationToken,
           upsertAutomationRun,
           getFullAutomationRevisionMetadata,
@@ -558,6 +571,7 @@ const createAppToken = createAppTokenFactory({
         for (const run of storedRun.functionRuns) {
           expect(run.status).to.equal(expectedStatus)
         }
+        expect(eventFired).to.be.true
       })
     })
     describe('Run conditions are NOT met if', () => {
@@ -1016,7 +1030,7 @@ const createAppToken = createAppTokenFactory({
             }),
             getEncryptionKeyPairFor,
             createAppToken,
-            automateRunsEmitter: AutomateRunsEmitter.emit,
+            emitEvent: getEventBus().emit,
             getAutomationToken,
             upsertAutomationRun,
             getFullAutomationRevisionMetadata,
@@ -1242,7 +1256,7 @@ const createAppToken = createAppTokenFactory({
             getAutomationFunctionRunRecord: getFunctionRun,
             upsertAutomationFunctionRunRecord: upsertAutomationFunctionRun,
             automationRunUpdater: updateAutomationRun,
-            runEventEmit: AutomateRunsEmitter.emit
+            emitEvent: getEventBus().emit
           })
 
           return report
@@ -1361,6 +1375,15 @@ const createAppToken = createAppTokenFactory({
             projectId: testUserStream.id
           }
 
+          let eventFired = false
+          getEventBus().listenOnce(
+            AutomationRunEvents.StatusUpdated,
+            async ({ payload }) => {
+              expect(payload.functionRun.id).to.equal(functionRunId)
+              eventFired = true
+            },
+            { timeout: 1000 }
+          )
           await expect(report(params)).to.eventually.be.true
 
           const [updatedRun, updatedFnRun] = await Promise.all([
@@ -1371,6 +1394,7 @@ const createAppToken = createAppTokenFactory({
           expect(updatedRun?.status).to.equal(AutomationRunStatuses.succeeded)
           expect(updatedFnRun?.status).to.equal(AutomationRunStatuses.succeeded)
           expect(updatedFnRun?.contextView).to.equal(contextView)
+          expect(eventFired).to.be.true
         })
       })
     })
diff --git a/packages/server/modules/core/graph/generated/graphql.ts b/packages/server/modules/core/graph/generated/graphql.ts
index fb5c4c9079..40dc3530db 100644
--- a/packages/server/modules/core/graph/generated/graphql.ts
+++ b/packages/server/modules/core/graph/generated/graphql.ts
@@ -5,7 +5,7 @@ import { CommentReplyAuthorCollectionGraphQLReturn, CommentGraphQLReturn } from
 import { PendingStreamCollaboratorGraphQLReturn } from '@/modules/serverinvites/helpers/graphTypes';
 import { FileUploadGraphQLReturn } from '@/modules/fileuploads/helpers/types';
 import { AutomateFunctionGraphQLReturn, AutomateFunctionReleaseGraphQLReturn, AutomationGraphQLReturn, AutomationRevisionGraphQLReturn, AutomationRevisionFunctionGraphQLReturn, AutomateRunGraphQLReturn, AutomationRunTriggerGraphQLReturn, AutomationRevisionTriggerDefinitionGraphQLReturn, AutomateFunctionRunGraphQLReturn, TriggeredAutomationsStatusGraphQLReturn, ProjectAutomationMutationsGraphQLReturn, ProjectTriggeredAutomationsStatusUpdatedMessageGraphQLReturn, ProjectAutomationsUpdatedMessageGraphQLReturn, UserAutomateInfoGraphQLReturn } from '@/modules/automate/helpers/graphTypes';
-import { WorkspaceGraphQLReturn, WorkspaceSsoGraphQLReturn, WorkspaceMutationsGraphQLReturn, WorkspaceInviteMutationsGraphQLReturn, WorkspaceProjectMutationsGraphQLReturn, PendingWorkspaceCollaboratorGraphQLReturn, WorkspaceCollaboratorGraphQLReturn, ProjectRoleGraphQLReturn } from '@/modules/workspacesCore/helpers/graphTypes';
+import { WorkspaceGraphQLReturn, WorkspaceSsoGraphQLReturn, WorkspaceMutationsGraphQLReturn, WorkspaceInviteMutationsGraphQLReturn, WorkspaceProjectMutationsGraphQLReturn, PendingWorkspaceCollaboratorGraphQLReturn, WorkspaceCollaboratorGraphQLReturn, WorkspaceJoinRequestGraphQLReturn, ProjectRoleGraphQLReturn } from '@/modules/workspacesCore/helpers/graphTypes';
 import { WorkspaceBillingMutationsGraphQLReturn } from '@/modules/gatekeeper/helpers/graphTypes';
 import { WebhookGraphQLReturn } from '@/modules/webhooks/helpers/graphTypes';
 import { SmartTextEditorValueGraphQLReturn } from '@/modules/core/services/richTextEditorService';
@@ -176,6 +176,10 @@ export type AdminUsersListItem = {
   registeredUser?: Maybe<User>;
 };
 
+export type AdminWorkspaceJoinRequestFilter = {
+  status?: InputMaybe<WorkspaceJoinRequestStatus>;
+};
+
 export type ApiToken = {
   __typename?: 'ApiToken';
   createdAt: Scalars['DateTime']['output'];
@@ -4168,6 +4172,8 @@ export type WebhookUpdateInput = {
 
 export type Workspace = {
   __typename?: 'Workspace';
+  /** Get all join requests for all the workspaces the user is an admin of */
+  adminWorkspacesJoinRequests: WorkspaceJoinRequestCollection;
   automateFunctions: AutomateFunctionCollection;
   createdAt: Scalars['DateTime']['output'];
   /** Info about the workspace creation state */
@@ -4211,6 +4217,13 @@ export type Workspace = {
 };
 
 
+export type WorkspaceAdminWorkspacesJoinRequestsArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  filter?: InputMaybe<AdminWorkspaceJoinRequestFilter>;
+  limit?: Scalars['Int']['input'];
+};
+
+
 export type WorkspaceAutomateFunctionsArgs = {
   cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<AutomateFunctionsFilter>;
@@ -4396,6 +4409,27 @@ export type WorkspaceInviteUseInput = {
   token: Scalars['String']['input'];
 };
 
+export type WorkspaceJoinRequest = {
+  __typename?: 'WorkspaceJoinRequest';
+  createdAt: Scalars['DateTime']['output'];
+  status: WorkspaceJoinRequestStatus;
+  user: LimitedUser;
+  workspace: Workspace;
+};
+
+export type WorkspaceJoinRequestCollection = {
+  __typename?: 'WorkspaceJoinRequestCollection';
+  cursor?: Maybe<Scalars['String']['output']>;
+  items: Array<WorkspaceJoinRequest>;
+  totalCount: Scalars['Int']['output'];
+};
+
+export enum WorkspaceJoinRequestStatus {
+  Accepted = 'accepted',
+  Denied = 'denied',
+  Pending = 'pending'
+}
+
 export type WorkspaceMutations = {
   __typename?: 'WorkspaceMutations';
   addDomain: Workspace;
@@ -4742,6 +4776,7 @@ export type ResolversTypes = {
   AdminUserListItem: ResolverTypeWrapper<AdminUserListItem>;
   AdminUsersListCollection: ResolverTypeWrapper<Omit<AdminUsersListCollection, 'items'> & { items: Array<ResolversTypes['AdminUsersListItem']> }>;
   AdminUsersListItem: ResolverTypeWrapper<Omit<AdminUsersListItem, 'invitedUser' | 'registeredUser'> & { invitedUser?: Maybe<ResolversTypes['ServerInvite']>, registeredUser?: Maybe<ResolversTypes['User']> }>;
+  AdminWorkspaceJoinRequestFilter: AdminWorkspaceJoinRequestFilter;
   ApiToken: ResolverTypeWrapper<ApiToken>;
   ApiTokenCreateInput: ApiTokenCreateInput;
   AppAuthor: ResolverTypeWrapper<AppAuthor>;
@@ -5002,6 +5037,9 @@ export type ResolversTypes = {
   WorkspaceInviteMutations: ResolverTypeWrapper<WorkspaceInviteMutationsGraphQLReturn>;
   WorkspaceInviteResendInput: WorkspaceInviteResendInput;
   WorkspaceInviteUseInput: WorkspaceInviteUseInput;
+  WorkspaceJoinRequest: ResolverTypeWrapper<WorkspaceJoinRequestGraphQLReturn>;
+  WorkspaceJoinRequestCollection: ResolverTypeWrapper<Omit<WorkspaceJoinRequestCollection, 'items'> & { items: Array<ResolversTypes['WorkspaceJoinRequest']> }>;
+  WorkspaceJoinRequestStatus: WorkspaceJoinRequestStatus;
   WorkspaceMutations: ResolverTypeWrapper<WorkspaceMutationsGraphQLReturn>;
   WorkspacePlan: ResolverTypeWrapper<WorkspacePlan>;
   WorkspacePlanStatuses: WorkspacePlanStatuses;
@@ -5040,6 +5078,7 @@ export type ResolversParentTypes = {
   AdminUserListItem: AdminUserListItem;
   AdminUsersListCollection: Omit<AdminUsersListCollection, 'items'> & { items: Array<ResolversParentTypes['AdminUsersListItem']> };
   AdminUsersListItem: Omit<AdminUsersListItem, 'invitedUser' | 'registeredUser'> & { invitedUser?: Maybe<ResolversParentTypes['ServerInvite']>, registeredUser?: Maybe<ResolversParentTypes['User']> };
+  AdminWorkspaceJoinRequestFilter: AdminWorkspaceJoinRequestFilter;
   ApiToken: ApiToken;
   ApiTokenCreateInput: ApiTokenCreateInput;
   AppAuthor: AppAuthor;
@@ -5275,6 +5314,8 @@ export type ResolversParentTypes = {
   WorkspaceInviteMutations: WorkspaceInviteMutationsGraphQLReturn;
   WorkspaceInviteResendInput: WorkspaceInviteResendInput;
   WorkspaceInviteUseInput: WorkspaceInviteUseInput;
+  WorkspaceJoinRequest: WorkspaceJoinRequestGraphQLReturn;
+  WorkspaceJoinRequestCollection: Omit<WorkspaceJoinRequestCollection, 'items'> & { items: Array<ResolversParentTypes['WorkspaceJoinRequest']> };
   WorkspaceMutations: WorkspaceMutationsGraphQLReturn;
   WorkspacePlan: WorkspacePlan;
   WorkspaceProjectCreateInput: WorkspaceProjectCreateInput;
@@ -6719,6 +6760,7 @@ export type WebhookEventCollectionResolvers<ContextType = GraphQLContext, Parent
 };
 
 export type WorkspaceResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['Workspace'] = ResolversParentTypes['Workspace']> = {
+  adminWorkspacesJoinRequests?: Resolver<ResolversTypes['WorkspaceJoinRequestCollection'], ParentType, ContextType, RequireFields<WorkspaceAdminWorkspacesJoinRequestsArgs, 'limit'>>;
   automateFunctions?: Resolver<ResolversTypes['AutomateFunctionCollection'], ParentType, ContextType, RequireFields<WorkspaceAutomateFunctionsArgs, 'limit'>>;
   createdAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
   creationState?: Resolver<Maybe<ResolversTypes['WorkspaceCreationState']>, ParentType, ContextType>;
@@ -6797,6 +6839,21 @@ export type WorkspaceInviteMutationsResolvers<ContextType = GraphQLContext, Pare
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type WorkspaceJoinRequestResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['WorkspaceJoinRequest'] = ResolversParentTypes['WorkspaceJoinRequest']> = {
+  createdAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
+  status?: Resolver<ResolversTypes['WorkspaceJoinRequestStatus'], ParentType, ContextType>;
+  user?: Resolver<ResolversTypes['LimitedUser'], ParentType, ContextType>;
+  workspace?: Resolver<ResolversTypes['Workspace'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type WorkspaceJoinRequestCollectionResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['WorkspaceJoinRequestCollection'] = ResolversParentTypes['WorkspaceJoinRequestCollection']> = {
+  cursor?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  items?: Resolver<Array<ResolversTypes['WorkspaceJoinRequest']>, ParentType, ContextType>;
+  totalCount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type WorkspaceMutationsResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['WorkspaceMutations'] = ResolversParentTypes['WorkspaceMutations']> = {
   addDomain?: Resolver<ResolversTypes['Workspace'], ParentType, ContextType, RequireFields<WorkspaceMutationsAddDomainArgs, 'input'>>;
   billing?: Resolver<ResolversTypes['WorkspaceBillingMutations'], ParentType, ContextType>;
@@ -7026,6 +7083,8 @@ export type Resolvers<ContextType = GraphQLContext> = {
   WorkspaceCreationState?: WorkspaceCreationStateResolvers<ContextType>;
   WorkspaceDomain?: WorkspaceDomainResolvers<ContextType>;
   WorkspaceInviteMutations?: WorkspaceInviteMutationsResolvers<ContextType>;
+  WorkspaceJoinRequest?: WorkspaceJoinRequestResolvers<ContextType>;
+  WorkspaceJoinRequestCollection?: WorkspaceJoinRequestCollectionResolvers<ContextType>;
   WorkspaceMutations?: WorkspaceMutationsResolvers<ContextType>;
   WorkspacePlan?: WorkspacePlanResolvers<ContextType>;
   WorkspaceProjectMutations?: WorkspaceProjectMutationsResolvers<ContextType>;
diff --git a/packages/server/modules/core/graph/plugins/logging.ts b/packages/server/modules/core/graph/plugins/logging.ts
index a5febf63c2..fdba4f0d2a 100644
--- a/packages/server/modules/core/graph/plugins/logging.ts
+++ b/packages/server/modules/core/graph/plugins/logging.ts
@@ -6,6 +6,7 @@ import { FieldNode, SelectionNode } from 'graphql'
 import { ApolloServerPlugin } from '@apollo/server'
 import { GraphQLContext } from '@/modules/shared/helpers/typeHelper'
 import { shouldLogAsInfoLevel } from '@/logging/graphqlError'
+import { getRequestContext } from '@/logging/requestContext'
 
 type ApolloLoggingPluginTransaction = {
   start: number
@@ -62,7 +63,9 @@ export const loggingPluginFactory: (deps: {
         const auth = ctx.contextValue
         const userId = auth?.userId
 
-        const actionName = `${ctx.operation.operation} ${firstSelectedField.name.value}`
+        const operationName = ctx.operationName || ctx.operation?.name?.value
+        const actionName =
+          operationName || `${ctx.operation.operation} ${firstSelectedField.name.value}`
         const op = `GQL ${actionName}`
         const name = `GQL ${firstSelectedField.name.value}`
         const kind = ctx.operation.operation
@@ -73,8 +76,8 @@ export const loggingPluginFactory: (deps: {
           graphql_operation_kind: kind,
           graphql_query: query,
           graphql_variables: redactSensitiveVariables(variables),
-          graphql_operation_value: op,
-          graphql_operation_name: name,
+          graphql_operation_name: actionName,
+          graphql_operation_title: op,
           userId
         })
 
@@ -109,6 +112,13 @@ export const loggingPluginFactory: (deps: {
           const query = ctx.request.query
           const variables = redactSensitiveVariables(ctx.request.variables)
 
+          const reqCtx = getRequestContext()
+          if (reqCtx) {
+            logger = logger.child({
+              dbMetrics: reqCtx.dbMetrics
+            })
+          }
+
           if (err.path) {
             logger = logger.child({
               'query-path': err.path.join(' > '),
@@ -120,28 +130,35 @@ export const loggingPluginFactory: (deps: {
           if (shouldLogAsInfoLevel(err)) {
             logger.info(
               { err },
-              '{graphql_operation_value} failed after {apollo_query_duration_ms} ms'
+              '{graphql_operation_title} failed after {apollo_query_duration_ms} ms'
             )
           } else {
             logger.error(
               err,
-              '{graphql_operation_value} failed after {apollo_query_duration_ms} ms'
+              '{graphql_operation_title} failed after {apollo_query_duration_ms} ms'
             )
           }
         }
       },
       willSendResponse: async (ctx) => {
-        const logger = ctx.contextValue.log || graphqlLogger
+        let logger = ctx.contextValue.log || graphqlLogger
 
         if (ctx.request.transaction) {
           ctx.request.transaction.finish()
         }
 
+        const reqCtx = getRequestContext()
+        if (reqCtx) {
+          logger = logger.child({
+            dbMetrics: reqCtx.dbMetrics
+          })
+        }
+
         logger.info(
           {
             apollo_query_duration_ms: Date.now() - apolloRequestStart
           },
-          '{graphql_operation_value} finished after {apollo_query_duration_ms} ms'
+          '{graphql_operation_title} finished after {apollo_query_duration_ms} ms'
         )
       }
     }
diff --git a/packages/server/modules/core/rest/static.ts b/packages/server/modules/core/rest/static.ts
index 26ed599913..fc53dfcba5 100644
--- a/packages/server/modules/core/rest/static.ts
+++ b/packages/server/modules/core/rest/static.ts
@@ -4,4 +4,8 @@ import * as path from 'path'
 
 export default (app: express.Application) => {
   app.use('/static', express.static(path.join(packageRoot, 'assets', 'public')))
+  app.use('/api/ping', (_, res) => {
+    res.set('Content-Type', 'text/plain')
+    res.send('pong')
+  })
 }
diff --git a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
index 804fe3d907..b907c0cc74 100644
--- a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
+++ b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
@@ -157,6 +157,10 @@ export type AdminUsersListItem = {
   registeredUser?: Maybe<User>;
 };
 
+export type AdminWorkspaceJoinRequestFilter = {
+  status?: InputMaybe<WorkspaceJoinRequestStatus>;
+};
+
 export type ApiToken = {
   __typename?: 'ApiToken';
   createdAt: Scalars['DateTime']['output'];
@@ -4149,6 +4153,8 @@ export type WebhookUpdateInput = {
 
 export type Workspace = {
   __typename?: 'Workspace';
+  /** Get all join requests for all the workspaces the user is an admin of */
+  adminWorkspacesJoinRequests: WorkspaceJoinRequestCollection;
   automateFunctions: AutomateFunctionCollection;
   createdAt: Scalars['DateTime']['output'];
   /** Info about the workspace creation state */
@@ -4192,6 +4198,13 @@ export type Workspace = {
 };
 
 
+export type WorkspaceAdminWorkspacesJoinRequestsArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  filter?: InputMaybe<AdminWorkspaceJoinRequestFilter>;
+  limit?: Scalars['Int']['input'];
+};
+
+
 export type WorkspaceAutomateFunctionsArgs = {
   cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<AutomateFunctionsFilter>;
@@ -4377,6 +4390,27 @@ export type WorkspaceInviteUseInput = {
   token: Scalars['String']['input'];
 };
 
+export type WorkspaceJoinRequest = {
+  __typename?: 'WorkspaceJoinRequest';
+  createdAt: Scalars['DateTime']['output'];
+  status: WorkspaceJoinRequestStatus;
+  user: LimitedUser;
+  workspace: Workspace;
+};
+
+export type WorkspaceJoinRequestCollection = {
+  __typename?: 'WorkspaceJoinRequestCollection';
+  cursor?: Maybe<Scalars['String']['output']>;
+  items: Array<WorkspaceJoinRequest>;
+  totalCount: Scalars['Int']['output'];
+};
+
+export enum WorkspaceJoinRequestStatus {
+  Accepted = 'accepted',
+  Denied = 'denied',
+  Pending = 'pending'
+}
+
 export type WorkspaceMutations = {
   __typename?: 'WorkspaceMutations';
   addDomain: Workspace;
diff --git a/packages/server/modules/multiregion/regionConfig.ts b/packages/server/modules/multiregion/regionConfig.ts
index 6999150167..c0cc3c4c90 100644
--- a/packages/server/modules/multiregion/regionConfig.ts
+++ b/packages/server/modules/multiregion/regionConfig.ts
@@ -60,6 +60,7 @@ export const getAvailableRegionConfig: GetAvailableRegionConfig = async () => {
 }
 
 export const getDefaultProjectRegionKey = async (): Promise<string | null> => {
+  if (!isMultiRegionEnabled()) return null
   const defaultRegionKey = (await getMultiRegionConfig()).defaultProjectRegionKey
   return defaultRegionKey ?? null
 }
diff --git a/packages/server/modules/shared/helpers/envHelper.ts b/packages/server/modules/shared/helpers/envHelper.ts
index b143551da7..f3e2f65f51 100644
--- a/packages/server/modules/shared/helpers/envHelper.ts
+++ b/packages/server/modules/shared/helpers/envHelper.ts
@@ -439,3 +439,7 @@ export const knexAsyncStackTracesEnabled = () => {
   if (!envSet) return undefined
   return getBooleanFromEnv('KNEX_ASYNC_STACK_TRACES_ENABLED')
 }
+
+export const asyncRequestContextEnabled = () => {
+  return getBooleanFromEnv('ASYNC_REQUEST_CONTEXT_ENABLED')
+}
diff --git a/packages/server/modules/shared/services/eventBus.ts b/packages/server/modules/shared/services/eventBus.ts
index d2ac819383..9eafc39976 100644
--- a/packages/server/modules/shared/services/eventBus.ts
+++ b/packages/server/modules/shared/services/eventBus.ts
@@ -39,6 +39,12 @@ import {
   commentEventsNamespace,
   CommentEventsPayloads
 } from '@/modules/comments/domain/events'
+import {
+  automationEventsNamespace,
+  AutomationEventsPayloads,
+  automationRunEventsNamespace,
+  AutomationRunEventsPayloads
+} from '@/modules/automate/domain/events'
 
 type AllEventsWildcard = '**'
 type EventWildcard = '*'
@@ -65,6 +71,8 @@ type EventsByNamespace = {
   [versionEventsNamespace]: VersionEventsPayloads
   [accessRequestEventsNamespace]: AccessRequestEventsPayloads
   [commentEventsNamespace]: CommentEventsPayloads
+  [automationEventsNamespace]: AutomationEventsPayloads
+  [automationRunEventsNamespace]: AutomationRunEventsPayloads
 }
 
 type EventTypes = UnionToIntersection<EventsByNamespace[keyof EventsByNamespace]>
diff --git a/packages/server/modules/shared/services/moduleEventEmitterSetup.ts b/packages/server/modules/shared/services/moduleEventEmitterSetup.ts
deleted file mode 100644
index ebf24d3091..0000000000
--- a/packages/server/modules/shared/services/moduleEventEmitterSetup.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { moduleLogger, Observability } from '@/logging/logging'
-import { MaybeAsync } from '@/modules/shared/helpers/typeHelper'
-import EventEmitter from 'eventemitter2'
-
-export type ModuleEventEmitterParams = {
-  moduleName: string
-  /**
-   * If you have multiple emitters in a single module, you can use this identify
-   * each of them differently
-   */
-  namespace?: string
-}
-
-/**
- * Initialize Speckle Module scoped event emitter. These can be used to make code more SOLID - instead of
- * modifying some code that does X every time you want to do something extra when X occurs, just emit an event
- * there and specify the listening code in a more appropriate module.
- *
- * Example: Instead of comment mentions being sent out from the comment repository's "createComment" function,
- * this repo function emits a COMMENT_CREATED event, that is then handled in a more appropriate module - the speckle
- * Notifications module.
- */
-export function initializeModuleEventEmitter<P extends Record<string, unknown>>(
-  params: ModuleEventEmitterParams
-) {
-  const { moduleName, namespace } = params
-  const identifier = namespace ? `${moduleName}-${namespace}` : moduleName
-
-  const logger = Observability.extendLoggerComponent(moduleLogger, identifier, 'events')
-
-  const errHandler = (e: unknown) => {
-    logger.error(e, `Unhandled ${identifier} event emitter error`)
-  }
-
-  const emitter = new EventEmitter()
-  emitter.on('uncaughtException', errHandler)
-  emitter.on('error', errHandler)
-
-  return {
-    /**
-     * Emit a module event. This function must be awaited to ensure all listeners
-     * execute. Any errors thrown in the listeners will bubble up and throw from
-     * the part of code that triggers this emit() call.
-     */
-    emit: async <K extends keyof P & string>(eventName: K, payload: P[K]) => {
-      return (await emitter.emitAsync(eventName, payload)) as unknown[]
-    },
-
-    /**
-     * Listen for module events. Any errors thrown here will bubble out of where
-     * emit() was invoked.
-     *
-     * @returns Callback for stopping listening
-     */
-    listen: <K extends keyof P & string>(
-      eventName: K,
-      handler: (payload: P[K]) => MaybeAsync<void>
-    ) => {
-      emitter.on(eventName, handler, {
-        async: true,
-        promisify: true
-      })
-
-      return () => {
-        emitter.removeListener(eventName, handler)
-      }
-    },
-
-    /**
-     * Destroy event emitter
-     */
-    destroy() {
-      emitter.removeAllListeners()
-    },
-
-    /**
-     * Debugger scoped to this module event emitter
-     */
-    logger
-  }
-}
diff --git a/packages/server/modules/shared/services/paginatedItems.ts b/packages/server/modules/shared/services/paginatedItems.ts
index 7a0f902758..4960b46d53 100644
--- a/packages/server/modules/shared/services/paginatedItems.ts
+++ b/packages/server/modules/shared/services/paginatedItems.ts
@@ -20,7 +20,7 @@ export const getPaginatedItemsFactory =
     getTotalCount
   }: {
     getItems: (args: TArgs) => Promise<T[]>
-    getTotalCount: (args: TArgs) => Promise<number>
+    getTotalCount: (args: Omit<TArgs, 'cursor' | 'limit'>) => Promise<number>
   }) =>
   async (args: TArgs): Promise<Collection<T>> => {
     const maybeDecodedCursor = args.cursor ? decodeIsoDateCursor(args.cursor) : null
diff --git a/packages/server/modules/workspaces/graph/resolvers/workspaceJoinRequests.ts b/packages/server/modules/workspaces/graph/resolvers/workspaceJoinRequests.ts
new file mode 100644
index 0000000000..e7c66549b3
--- /dev/null
+++ b/packages/server/modules/workspaces/graph/resolvers/workspaceJoinRequests.ts
@@ -0,0 +1,49 @@
+import { db } from '@/db/knex'
+import { Resolvers } from '@/modules/core/graph/generated/graphql'
+import { getPaginatedItemsFactory } from '@/modules/shared/services/paginatedItems'
+import {
+  countAdminWorkspaceJoinRequestsFactory,
+  getAdminWorkspaceJoinRequestsFactory
+} from '@/modules/workspaces/repositories/workspaceJoinRequests'
+import { WorkspaceJoinRequestStatus } from '@/modules/workspacesCore/domain/types'
+import { WorkspaceJoinRequestGraphQLReturn } from '@/modules/workspacesCore/helpers/graphTypes'
+
+export default {
+  Workspace: {
+    adminWorkspacesJoinRequests: async (parent, args, ctx) => {
+      const { filter, cursor, limit } = args
+
+      return await getPaginatedItemsFactory<
+        {
+          limit: number
+          cursor?: string
+          filter: {
+            workspaceId: string
+            userId: string
+            status?: WorkspaceJoinRequestStatus | null
+          }
+        },
+        WorkspaceJoinRequestGraphQLReturn
+      >({
+        getItems: getAdminWorkspaceJoinRequestsFactory({ db }),
+        getTotalCount: countAdminWorkspaceJoinRequestsFactory({ db })
+      })({
+        filter: {
+          workspaceId: parent.id,
+          status: filter?.status ?? undefined,
+          userId: ctx.userId! // This is the worskpace admin, not the request userId
+        },
+        cursor: cursor ?? undefined,
+        limit
+      })
+    }
+  },
+  WorkspaceJoinRequest: {
+    user: async (parent, _args, ctx) => {
+      return await ctx.loaders.users.getUser.load(parent.userId)
+    },
+    workspace: async (parent, _args, ctx) => {
+      return await ctx.loaders.workspaces!.getWorkspace.load(parent.workspaceId)
+    }
+  }
+} as Resolvers
diff --git a/packages/server/modules/workspaces/repositories/workspaceJoinRequests.ts b/packages/server/modules/workspaces/repositories/workspaceJoinRequests.ts
index 8c3ff44a60..13a77feed3 100644
--- a/packages/server/modules/workspaces/repositories/workspaceJoinRequests.ts
+++ b/packages/server/modules/workspaces/repositories/workspaceJoinRequests.ts
@@ -2,8 +2,15 @@ import {
   CreateWorkspaceJoinRequest,
   UpdateWorkspaceJoinRequestStatus
 } from '@/modules/workspaces/domain/operations'
-import { WorkspaceJoinRequest } from '@/modules/workspacesCore/domain/types'
-import { WorkspaceJoinRequests } from '@/modules/workspacesCore/helpers/db'
+import {
+  WorkspaceJoinRequest,
+  WorkspaceJoinRequestStatus
+} from '@/modules/workspacesCore/domain/types'
+import {
+  WorkspaceAcl,
+  WorkspaceJoinRequests
+} from '@/modules/workspacesCore/helpers/db'
+import { Roles } from '@speckle/shared'
 import { Knex } from 'knex'
 
 const tables = {
@@ -27,3 +34,56 @@ export const updateWorkspaceJoinRequestStatusFactory =
       .onConflict(['workspaceId', 'userId'])
       .merge(['status'])
   }
+
+type WorkspaceJoinRequestFilter = {
+  workspaceId: string
+  status?: WorkspaceJoinRequestStatus | null
+  userId: string
+}
+
+const adminWorkspaceJoinRequestsBaseQueryFactory =
+  (db: Knex) => (filter: WorkspaceJoinRequestFilter) => {
+    const query = tables
+      .workspaceJoinRequests(db)
+      .innerJoin(
+        WorkspaceAcl.name,
+        WorkspaceAcl.col.workspaceId,
+        WorkspaceJoinRequests.col.workspaceId
+      )
+      .where(WorkspaceAcl.col.role, Roles.Workspace.Admin)
+      .where(WorkspaceAcl.col.userId, filter.userId)
+      .where(WorkspaceJoinRequests.col.workspaceId, filter.workspaceId)
+    if (filter.status) query.andWhere(WorkspaceJoinRequests.col.status, filter.status)
+    return query
+  }
+
+export const getAdminWorkspaceJoinRequestsFactory =
+  ({ db }: { db: Knex }) =>
+  async ({
+    filter,
+    cursor,
+    limit
+  }: {
+    filter: WorkspaceJoinRequestFilter
+    cursor?: string
+    limit: number
+  }) => {
+    const query = adminWorkspaceJoinRequestsBaseQueryFactory(db)(filter)
+
+    if (cursor) {
+      query.andWhere(WorkspaceJoinRequests.col.createdAt, '<', cursor)
+    }
+    return await query
+      .select<WorkspaceJoinRequest[]>(WorkspaceJoinRequests.cols)
+      .orderBy(WorkspaceJoinRequests.col.createdAt, 'desc')
+      .limit(limit)
+  }
+
+export const countAdminWorkspaceJoinRequestsFactory =
+  ({ db }: { db: Knex }) =>
+  async ({ filter }: { filter: WorkspaceJoinRequestFilter }) => {
+    const query = adminWorkspaceJoinRequestsBaseQueryFactory(db)(filter)
+
+    const [res] = await query.count()
+    return parseInt(res.count.toString())
+  }
diff --git a/packages/server/modules/workspaces/tests/helpers/graphql.ts b/packages/server/modules/workspaces/tests/helpers/graphql.ts
index f6a6266775..175ce9b600 100644
--- a/packages/server/modules/workspaces/tests/helpers/graphql.ts
+++ b/packages/server/modules/workspaces/tests/helpers/graphql.ts
@@ -323,3 +323,41 @@ export const dismissWorkspaceMutation = gql`
     }
   }
 `
+
+export const requestToJoinWorkspaceMutation = gql`
+  mutation requestToJoinWorkspace($input: WorkspaceRequestToJoinInput!) {
+    workspaceMutations {
+      requestToJoin(input: $input)
+    }
+  }
+`
+
+export const getWorkspaceWithJoinRequestsQuery = gql`
+  query GetWorkspaceWithJoinRequests(
+    $workspaceId: String!
+    $filter: AdminWorkspaceJoinRequestFilter
+    $cursor: String
+    $limit: Int
+  ) {
+    workspace(id: $workspaceId) {
+      ...BasicWorkspace
+      adminWorkspacesJoinRequests(filter: $filter, cursor: $cursor, limit: $limit) {
+        items {
+          status
+          user {
+            id
+            name
+          }
+          workspace {
+            id
+            name
+          }
+          createdAt
+        }
+        cursor
+        totalCount
+      }
+    }
+  }
+  ${basicWorkspaceFragment}
+`
diff --git a/packages/server/modules/workspaces/tests/integration/workspaceJoinRequests.graph.spec.ts b/packages/server/modules/workspaces/tests/integration/workspaceJoinRequests.graph.spec.ts
new file mode 100644
index 0000000000..ec10b513b8
--- /dev/null
+++ b/packages/server/modules/workspaces/tests/integration/workspaceJoinRequests.graph.spec.ts
@@ -0,0 +1,141 @@
+import { db } from '@/db/knex'
+import { createRandomString } from '@/modules/core/helpers/testHelpers'
+import { createTestWorkspace } from '@/modules/workspaces/tests/helpers/creation'
+import {
+  BasicTestUser,
+  createAuthTokenForUser,
+  createTestUser
+} from '@/test/authHelper'
+import {
+  GetWorkspaceWithJoinRequestsDocument,
+  RequestToJoinWorkspaceDocument
+} from '@/test/graphql/generated/graphql'
+import { createTestContext, testApolloServer } from '@/test/graphqlHelper'
+import { beforeEachContext } from '@/test/hooks'
+import { AllScopes, Roles } from '@speckle/shared'
+import { expect } from 'chai'
+import { upsertWorkspaceRoleFactory } from '@/modules/workspaces/repositories/workspaces'
+
+async function login(user: BasicTestUser) {
+  const token = await createAuthTokenForUser(user.id, AllScopes)
+  return await testApolloServer({
+    context: await createTestContext({
+      auth: true,
+      userId: user.id,
+      token,
+      role: user.role,
+      scopes: AllScopes
+    })
+  })
+}
+
+before(async () => {
+  await beforeEachContext()
+})
+
+describe('WorkspaceJoinRequests GQL', () => {
+  describe('Workspace.adminWorkspacesJoinRequests', () => {
+    it('should return the workspace join requests for the admin', async () => {
+      const admin = await createTestUser({
+        name: 'admin user',
+        role: Roles.Server.User
+      })
+
+      const user1 = await createTestUser({ name: 'user 1', role: Roles.Server.User })
+      const user2 = await createTestUser({ name: 'user 2', role: Roles.Server.User })
+
+      const workspace1 = {
+        id: createRandomString(),
+        name: 'Workspace 1',
+        ownerId: admin.id,
+        description: ''
+      }
+      await createTestWorkspace(workspace1, admin)
+
+      const workspace2 = {
+        id: createRandomString(),
+        name: 'Workspace 2',
+        ownerId: admin.id,
+        description: ''
+      }
+      await createTestWorkspace(workspace2, admin)
+
+      const nobodyWorkspace = {
+        id: createRandomString(),
+        name: 'nobody',
+        ownerId: admin.id,
+        description: ''
+      }
+      await createTestWorkspace(nobodyWorkspace, admin)
+
+      const nonAdminWorkspace = {
+        id: createRandomString(),
+        name: 'nonadmin',
+        ownerId: admin.id,
+        description: ''
+      }
+      await createTestWorkspace(nonAdminWorkspace, admin)
+      await upsertWorkspaceRoleFactory({ db })({
+        userId: admin.id,
+        workspaceId: nonAdminWorkspace.id,
+        role: Roles.Workspace.Member,
+        createdAt: new Date()
+      })
+
+      // User1 requests to join workspace1
+      const sessionUser1 = await login(user1)
+      const joinReq1 = await sessionUser1.execute(RequestToJoinWorkspaceDocument, {
+        input: {
+          workspaceId: workspace1.id
+        }
+      })
+      expect(joinReq1).to.not.haveGraphQLErrors()
+
+      // User2 requests to join workspace2
+      const sessionUser2 = await login(user2)
+      const joinReq2 = await sessionUser2.execute(RequestToJoinWorkspaceDocument, {
+        input: {
+          workspaceId: workspace2.id
+        }
+      })
+      expect(joinReq2).to.not.haveGraphQLErrors()
+
+      const sessionAdmin = await login(admin)
+      const workspace1Res = await sessionAdmin.execute(
+        GetWorkspaceWithJoinRequestsDocument,
+        {
+          workspaceId: workspace1.id
+        }
+      )
+      expect(workspace1Res).to.not.haveGraphQLErrors()
+
+      const { items: items1, totalCount: totalCount1 } =
+        workspace1Res.data!.workspace!.adminWorkspacesJoinRequests!
+
+      expect(totalCount1).to.equal(1)
+
+      expect(items1).to.have.length(1)
+      expect(items1[0].status).to.equal('pending')
+      expect(items1[0].workspace.id).to.equal(workspace1.id)
+      expect(items1[0].user.id).to.equal(user1.id)
+
+      const workspace2Res = await sessionAdmin.execute(
+        GetWorkspaceWithJoinRequestsDocument,
+        {
+          workspaceId: workspace2.id
+        }
+      )
+      expect(workspace2Res).to.not.haveGraphQLErrors()
+
+      const { items: items2, totalCount: totalCount2 } =
+        workspace2Res.data!.workspace!.adminWorkspacesJoinRequests!
+
+      expect(totalCount2).to.equal(1)
+
+      expect(items2).to.have.length(1)
+      expect(items2[0].status).to.equal('pending')
+      expect(items2[0].workspace.id).to.equal(workspace2.id)
+      expect(items2[0].user.id).to.equal(user2.id)
+    })
+  })
+})
diff --git a/packages/server/modules/workspacesCore/domain/types.ts b/packages/server/modules/workspacesCore/domain/types.ts
index 65d4ff5f91..182d60cfa7 100644
--- a/packages/server/modules/workspacesCore/domain/types.ts
+++ b/packages/server/modules/workspacesCore/domain/types.ts
@@ -67,11 +67,7 @@ export type WorkspaceRegionAssignment = {
   createdAt: Date
 }
 
-export type WorkspaceJoinRequestStatus =
-  | 'pending'
-  | 'accepted'
-  | 'rejected'
-  | 'dismissed'
+export type WorkspaceJoinRequestStatus = 'pending' | 'accepted' | 'denied' | 'dismissed'
 
 export type WorkspaceJoinRequest = {
   workspaceId: string
diff --git a/packages/server/modules/workspacesCore/helpers/graphTypes.ts b/packages/server/modules/workspacesCore/helpers/graphTypes.ts
index 34cc0f81d3..427a315915 100644
--- a/packages/server/modules/workspacesCore/helpers/graphTypes.ts
+++ b/packages/server/modules/workspacesCore/helpers/graphTypes.ts
@@ -2,10 +2,11 @@ import { MutationsObjectGraphQLReturn } from '@/modules/core/helpers/graphTypes'
 import { LimitedUserRecord } from '@/modules/core/helpers/types'
 import { WorkspaceSsoProviderRecord } from '@/modules/workspaces/domain/sso/types'
 import { WorkspaceTeamMember } from '@/modules/workspaces/domain/types'
-import { Workspace } from '@/modules/workspacesCore/domain/types'
+import { Workspace, WorkspaceJoinRequest } from '@/modules/workspacesCore/domain/types'
 import { WorkspaceRoles } from '@speckle/shared'
 
 export type WorkspaceGraphQLReturn = Workspace
+export type WorkspaceJoinRequestGraphQLReturn = WorkspaceJoinRequest
 export type WorkspaceBillingGraphQLReturn = { parent: Workspace }
 export type WorkspaceSsoGraphQLReturn = WorkspaceSsoProviderRecord
 export type WorkspaceMutationsGraphQLReturn = MutationsObjectGraphQLReturn
diff --git a/packages/server/test/graphql/generated/graphql.ts b/packages/server/test/graphql/generated/graphql.ts
index a78e5a42a5..8212f5b51c 100644
--- a/packages/server/test/graphql/generated/graphql.ts
+++ b/packages/server/test/graphql/generated/graphql.ts
@@ -158,6 +158,10 @@ export type AdminUsersListItem = {
   registeredUser?: Maybe<User>;
 };
 
+export type AdminWorkspaceJoinRequestFilter = {
+  status?: InputMaybe<WorkspaceJoinRequestStatus>;
+};
+
 export type ApiToken = {
   __typename?: 'ApiToken';
   createdAt: Scalars['DateTime']['output'];
@@ -4150,6 +4154,8 @@ export type WebhookUpdateInput = {
 
 export type Workspace = {
   __typename?: 'Workspace';
+  /** Get all join requests for all the workspaces the user is an admin of */
+  adminWorkspacesJoinRequests: WorkspaceJoinRequestCollection;
   automateFunctions: AutomateFunctionCollection;
   createdAt: Scalars['DateTime']['output'];
   /** Info about the workspace creation state */
@@ -4193,6 +4199,13 @@ export type Workspace = {
 };
 
 
+export type WorkspaceAdminWorkspacesJoinRequestsArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  filter?: InputMaybe<AdminWorkspaceJoinRequestFilter>;
+  limit?: Scalars['Int']['input'];
+};
+
+
 export type WorkspaceAutomateFunctionsArgs = {
   cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<AutomateFunctionsFilter>;
@@ -4378,6 +4391,27 @@ export type WorkspaceInviteUseInput = {
   token: Scalars['String']['input'];
 };
 
+export type WorkspaceJoinRequest = {
+  __typename?: 'WorkspaceJoinRequest';
+  createdAt: Scalars['DateTime']['output'];
+  status: WorkspaceJoinRequestStatus;
+  user: LimitedUser;
+  workspace: Workspace;
+};
+
+export type WorkspaceJoinRequestCollection = {
+  __typename?: 'WorkspaceJoinRequestCollection';
+  cursor?: Maybe<Scalars['String']['output']>;
+  items: Array<WorkspaceJoinRequest>;
+  totalCount: Scalars['Int']['output'];
+};
+
+export enum WorkspaceJoinRequestStatus {
+  Accepted = 'accepted',
+  Denied = 'denied',
+  Pending = 'pending'
+}
+
 export type WorkspaceMutations = {
   __typename?: 'WorkspaceMutations';
   addDomain: Workspace;
@@ -4899,6 +4933,23 @@ export type DismissWorkspaceMutationVariables = Exact<{
 
 export type DismissWorkspaceMutation = { __typename?: 'Mutation', workspaceMutations: { __typename?: 'WorkspaceMutations', dismiss: boolean } };
 
+export type RequestToJoinWorkspaceMutationVariables = Exact<{
+  input: WorkspaceRequestToJoinInput;
+}>;
+
+
+export type RequestToJoinWorkspaceMutation = { __typename?: 'Mutation', workspaceMutations: { __typename?: 'WorkspaceMutations', requestToJoin: boolean } };
+
+export type GetWorkspaceWithJoinRequestsQueryVariables = Exact<{
+  workspaceId: Scalars['String']['input'];
+  filter?: InputMaybe<AdminWorkspaceJoinRequestFilter>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+}>;
+
+
+export type GetWorkspaceWithJoinRequestsQuery = { __typename?: 'Query', workspace: { __typename?: 'Workspace', id: string, name: string, slug: string, updatedAt: string, createdAt: string, role?: string | null, readOnly: boolean, adminWorkspacesJoinRequests: { __typename?: 'WorkspaceJoinRequestCollection', cursor?: string | null, totalCount: number, items: Array<{ __typename?: 'WorkspaceJoinRequest', status: WorkspaceJoinRequestStatus, createdAt: string, user: { __typename?: 'LimitedUser', id: string, name: string }, workspace: { __typename?: 'Workspace', id: string, name: string } }> } } };
+
 export type BasicStreamAccessRequestFieldsFragment = { __typename?: 'StreamAccessRequest', id: string, requesterId: string, streamId: string, createdAt: string, requester: { __typename?: 'LimitedUser', id: string, name: string } };
 
 export type CreateStreamAccessRequestMutationVariables = Exact<{
@@ -5620,6 +5671,8 @@ export const SetWorkspaceDefaultRegionDocument = {"kind":"Document","definitions
 export const OnWorkspaceProjectsUpdatedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"OnWorkspaceProjectsUpdated"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceProjectsUpdated"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"workspaceSlug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"projectId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"project"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]} as unknown as DocumentNode<OnWorkspaceProjectsUpdatedSubscription, OnWorkspaceProjectsUpdatedSubscriptionVariables>;
 export const OnWorkspaceUpdatedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"OnWorkspaceUpdated"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceUpdated"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"workspaceSlug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"workspace"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicWorkspace"}},{"kind":"Field","name":{"kind":"Name","value":"team"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"invitedTeam"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicWorkspace"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Workspace"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"readOnly"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicPendingWorkspaceCollaborator"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingWorkspaceCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"token"}}]}}]} as unknown as DocumentNode<OnWorkspaceUpdatedSubscription, OnWorkspaceUpdatedSubscriptionVariables>;
 export const DismissWorkspaceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"dismissWorkspace"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"WorkspaceDismissInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dismiss"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]}}]} as unknown as DocumentNode<DismissWorkspaceMutation, DismissWorkspaceMutationVariables>;
+export const RequestToJoinWorkspaceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"requestToJoinWorkspace"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"WorkspaceRequestToJoinInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"requestToJoin"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]}}]} as unknown as DocumentNode<RequestToJoinWorkspaceMutation, RequestToJoinWorkspaceMutationVariables>;
+export const GetWorkspaceWithJoinRequestsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetWorkspaceWithJoinRequests"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"AdminWorkspaceJoinRequestFilter"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspace"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicWorkspace"}},{"kind":"Field","name":{"kind":"Name","value":"adminWorkspacesJoinRequests"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filter"}}},{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"workspace"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicWorkspace"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Workspace"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"readOnly"}}]}}]} as unknown as DocumentNode<GetWorkspaceWithJoinRequestsQuery, GetWorkspaceWithJoinRequestsQueryVariables>;
 export const CreateStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequestCreate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"requester"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"requesterId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<CreateStreamAccessRequestMutation, CreateStreamAccessRequestMutationVariables>;
 export const GetStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"requester"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"requesterId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<GetStreamAccessRequestQuery, GetStreamAccessRequestQueryVariables>;
 export const GetFullStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetFullStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}},{"kind":"Field","name":{"kind":"Name","value":"stream"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"requester"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"requesterId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<GetFullStreamAccessRequestQuery, GetFullStreamAccessRequestQueryVariables>;
diff --git a/packages/server/test/speckle-helpers/automationHelper.ts b/packages/server/test/speckle-helpers/automationHelper.ts
index 81334c3114..0e94fb315d 100644
--- a/packages/server/test/speckle-helpers/automationHelper.ts
+++ b/packages/server/test/speckle-helpers/automationHelper.ts
@@ -39,9 +39,9 @@ import {
 } from '@/modules/automate/services/encryption'
 import { buildDecryptor } from '@/modules/shared/utils/libsodium'
 import { db } from '@/db/knex'
-import { AutomationsEmitter } from '@/modules/automate/events/automations'
 import { validateStreamAccessFactory } from '@/modules/core/services/streams/access'
 import { authorizeResolver } from '@/modules/shared'
+import { getEventBus } from '@/modules/shared/services/eventBus'
 
 const storeAutomation = storeAutomationFactory({ db })
 const storeAutomationToken = storeAutomationTokenFactory({ db })
@@ -69,7 +69,7 @@ export const buildAutomationCreate = (
     storeAutomation,
     storeAutomationToken,
     validateStreamAccess,
-    automationsEventsEmit: AutomationsEmitter.emit
+    eventEmit: getEventBus().emit
   })
 
   return create
@@ -101,7 +101,7 @@ export const buildAutomationRevisionCreate = (
       buildDecryptor
     }),
     validateStreamAccess,
-    automationsEventsEmit: AutomationsEmitter.emit,
+    eventEmit: getEventBus().emit,
     ...overrides
   })
 
diff --git a/packages/ui-components/src/components/layout/Dialog.vue b/packages/ui-components/src/components/layout/Dialog.vue
index 184ce33f98..bde6bcf073 100644
--- a/packages/ui-components/src/components/layout/Dialog.vue
+++ b/packages/ui-components/src/components/layout/Dialog.vue
@@ -268,13 +268,15 @@ const dialogPanelClasses = computed(() => {
 const slotContainerClasses = computed(() => {
   const classParts: string[] = ['flex-1 simple-scrollbar overflow-y-auto text-body-xs']
 
-  if (hasTitle.value) {
-    classParts.push('px-6 py-4')
-    if (isFullscreenDesktop.value) {
-      classParts.push('md:p-0')
+  if (!props.isTransparent) {
+    if (hasTitle.value) {
+      classParts.push('px-6 py-4')
+      if (isFullscreenDesktop.value) {
+        classParts.push('md:p-0')
+      }
+    } else if (!isFullscreenDesktop.value) {
+      classParts.push('px-6 py-4')
     }
-  } else if (!isFullscreenDesktop.value) {
-    classParts.push('px-6 py-4')
   }
 
   return classParts.join(' ')
diff --git a/utils/helm/speckle-server/templates/_helpers.tpl b/utils/helm/speckle-server/templates/_helpers.tpl
index f7de1155e2..fd27441fcf 100644
--- a/utils/helm/speckle-server/templates/_helpers.tpl
+++ b/utils/helm/speckle-server/templates/_helpers.tpl
@@ -718,6 +718,11 @@ Generate the environment variables for Speckle server and Speckle objects deploy
   value: {{ .Values.server.migration.movedTo }}
   {{- end }}
 
+{{- if .Values.server.asyncRequestContextEnabled }}
+- name: ASYNC_REQUEST_CONTEXT_ENABLED
+  value: {{ .Values.server.asyncRequestContextEnabled | quote }}
+{{- end}}
+
 # *** No more closures flag - prevents writing to the closure table ***
 - name: FF_NO_CLOSURE_WRITES
   value: {{ .Values.featureFlags.noClosureWrites | quote }}
diff --git a/utils/helm/speckle-server/values.schema.json b/utils/helm/speckle-server/values.schema.json
index b4431e64f7..093f61c131 100644
--- a/utils/helm/speckle-server/values.schema.json
+++ b/utils/helm/speckle-server/values.schema.json
@@ -661,6 +661,11 @@
           "description": "The url of the Speckle Automate instance",
           "default": "https://automate.speckle.systems"
         },
+        "asyncRequestContextEnabled": {
+          "type": "boolean",
+          "description": "If enabled, the server will use the async request context for improved log msg correlation",
+          "default": false
+        },
         "gendoAI": {
           "type": "object",
           "properties": {
diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml
index d25c0e45dd..e3bd1e2338 100644
--- a/utils/helm/speckle-server/values.yaml
+++ b/utils/helm/speckle-server/values.yaml
@@ -478,6 +478,8 @@ server:
   max_project_models_per_page: 500
   ## @param server.speckleAutomateUrl The url of the Speckle Automate instance
   speckleAutomateUrl: 'https://automate.speckle.systems'
+  ## @param server.asyncRequestContextEnabled If enabled, the server will use the async request context for improved log msg correlation
+  asyncRequestContextEnabled: false
 
   gendoAI:
     ## @param server.gendoAI.apiUrl The url of the Gendo AI application, including protocol.